diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 61a9e8f54..35b7ccc56 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -81,14 +81,11 @@ 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_events = [];