diff --git a/modules/scheduling/calender_fetcher.py b/modules/scheduling/calender_fetcher.py
index 05f1236bed79913c91fb630587b8c80f2da80fc8..0c2be82477e290cc58f3239b190a35a5913f6042 100644
--- a/modules/scheduling/calender_fetcher.py
+++ b/modules/scheduling/calender_fetcher.py
@@ -73,6 +73,9 @@ class CalendarFetcher:
         try:
             self.logger.debug("Fetching schedules from STEERING")
             self.fetched_schedule_data = self.__fetch_schedule_data__()
+            if not self.fetched_schedule_data:
+                self.logger.critical(SimpleUtil.red("No schedules fetched from API!"))
+                return None
         except urllib.error.HTTPError as e:
             self.logger.critical("Cannot fetch from " + self.url["api_steering_calendar"] + "! Reason: " + str(e))
             self.fetched_schedule_data = None
@@ -214,7 +217,7 @@ class CalendarFetcher:
                     schedule["station_fallback_id"] = local_station_fallback_id 
                     schedule["station_fallback"] = self.__fetch_schedule_playlist__(schedule, local_station_fallback_id, fetched_entries)
                     if schedule["station_fallback"]:
-                        self.logger.info("Assigned playlist #%s as local station fallback" % local_station_fallback_id)
+                        self.logger.info("Assigned playlist #%s as local station fallback to schedule #%s" % (local_station_fallback_id, schedule["schedule_id"]))
 
         except Exception as e:
             self.logger.error("Error while fetching playlists from API endpoints: " + str(e), e)