diff --git a/lib/raumzeit/CycleData.php b/lib/raumzeit/CycleData.php
index d89d8aeb17f276b4bc65b3db1e5e8270f3e4ea1f..8ba61bf2afb59594a59c8918d72d526bb72f5104 100644
--- a/lib/raumzeit/CycleData.php
+++ b/lib/raumzeit/CycleData.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.php b/lib/raumzeit/SingleDate.php
index 06cb9a22a27cd765bc727d2f7e2de9a10aaae4e2..c63800f139ff4865903e16b82444de570f345aa3 100644
--- a/lib/raumzeit/SingleDate.php
+++ b/lib/raumzeit/SingleDate.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) {