diff --git a/lib/raumzeit/CycleData.class.php b/lib/raumzeit/CycleData.class.php
index 587e0bc7f5f60d066816f0024506a0ca370e34a9..ec0be1c6312988fe6fdc783a9651ff834fc67fe8 100644
--- a/lib/raumzeit/CycleData.class.php
+++ b/lib/raumzeit/CycleData.class.php
@@ -315,7 +315,7 @@ class CycleData
                 unset($termin);
                 $termin = new SingleDate();
                 $termin->fillValuesFromArray($val);
-                $termin->setExTermin($val['ex_termin']);
+                $termin->setExTermin(!empty($val['ex_termin']));
                 $this->termine[$val['termin_id']] = $termin;
             }
             return TRUE;
diff --git a/lib/raumzeit/SingleDate.class.php b/lib/raumzeit/SingleDate.class.php
index 593571583038f035aca94fe2b950146e3a986c08..bc9915eb1c8d19bea3eb5c1db51397023b84c973 100644
--- a/lib/raumzeit/SingleDate.class.php
+++ b/lib/raumzeit/SingleDate.class.php
@@ -370,7 +370,7 @@ class SingleDate
 
         if (!$name) {
             $holy_type = holiday($this->date);
-            $name = $holy_type['name'];
+            $name = $holy_type ? $holy_type['name'] : null;
         }
 
         if ($name) {