diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 815631d60..f957ccff6 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -81,7 +81,14 @@ class Stundenplan extends FHCAPI_Controller
 		$lv_id = $this->input->get('lv_id', TRUE);
 
 		$stundenplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
-		$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);	
+		if( is_null($stundenplan_events) || isEmptyArray($stundenplan_events) )
+		{
+			$stundenplan_events = array();
+		}
+		else
+		{
+			$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);
+		}
 
 		// fetching moodle events
 		$moodle_start_date = new DateTime($start_date);