diff --git a/calendar/inc/class.calendar.inc.php b/calendar/inc/class.calendar.inc.php
index b09c7048a9..35251c6d6d 100755
--- a/calendar/inc/class.calendar.inc.php
+++ b/calendar/inc/class.calendar.inc.php
@@ -448,7 +448,7 @@ class calendar extends calendar_
 
 		$this->repeating_event_matches = 0;
 
-		if(count($this->repeated_events) <= 0)
+		if($this->repeated_events == Null)
 		{
 			return False;
 		}
diff --git a/calendar/inc/class.calendar_holiday.inc.php b/calendar/inc/class.calendar_holiday.inc.php
index a4e92168cd..c193336346 100755
--- a/calendar/inc/class.calendar_holiday.inc.php
+++ b/calendar/inc/class.calendar_holiday.inc.php
@@ -280,6 +280,11 @@ class calendar_holiday
 	{
 		global $phpgw;
 
+		if($this->holidays == Null)
+		{
+			return False;
+		}
+		
 		$c_holidays = count($this->holidays);
 		for($i=0;$i<$c_holidays;$i++)
 		{