diff --git a/modules/scheduling/calendar.py b/modules/scheduling/calendar.py
index 75d7097eb719bc30dde70bb4870adf17be871033..2d0e184bc729c93296c432800150d1477ae312b2 100644
--- a/modules/scheduling/calendar.py
+++ b/modules/scheduling/calendar.py
@@ -135,7 +135,7 @@ class AuraCalendarService(threading.Thread):
                 schedule_db = self.store_schedule(schedule)
 
                 # Store playlists to play
-                self.store_playlist(schedule_db, schedule_db.playlist_id, schedule["playlist"])
+                self.store_playlist(schedule_db, schedule_db.playlist_id, schedule["playlist"], 0)
                 if schedule_db.schedule_fallback_id:
                     self.store_playlist(schedule_db, schedule_db.schedule_fallback_id, schedule["schedule_fallback"], 1)
                 if schedule_db.show_fallback_id:
@@ -208,6 +208,10 @@ class AuraCalendarService(threading.Thread):
         """
         Stores the Playlist to the database.
         """
+        if not playlist_id or not fetched_playlist:
+            self.logger.warn("Cannot store invalid playlist with ID '%s'!" % playlist_id)
+            return
+            
         playlist_db = Playlist.select_playlist_for_schedule(schedule_db.schedule_start, playlist_id)
         havetoadd = False
 
diff --git a/modules/scheduling/calender_fetcher.py b/modules/scheduling/calender_fetcher.py
index e75f78e6dd29292cc4e8266768b620e614228445..0d54a13aee360ca75815fbff5ee82a75427b3b47 100644
--- a/modules/scheduling/calender_fetcher.py
+++ b/modules/scheduling/calender_fetcher.py
@@ -207,9 +207,9 @@ class CalendarFetcher:
 
                 # If Steering doesn't provide a station fallback, the local one is used
                 if not schedule["station_fallback"] and int(local_station_fallback_id) > 0:
-                    schedule["station_fallback"]  = self.__fetch_schedule_playlist__(schedule, local_station_fallback_id,  fetched_entries)
+                    schedule["station_fallback"]  = self.__fetch_schedule_playlist__(schedule, local_station_fallback_id, fetched_entries)
                     if schedule["station_fallback"]:
-                        self.logger.info("Set station fallback to playlist #%s" % local_station_fallback_id)
+                        self.logger.info("Assigned playlist #%s as local station fallback" % local_station_fallback_id)
 
         except Exception as e:
             self.logger.error("Error while fetching playlists from API endpoints: " + str(e), e)