diff --git a/modules/communication/liquidsoap/communicator.py b/modules/communication/liquidsoap/communicator.py
index b9ec5ae7f0a9c709dc4228eb10a3fb96cb32e523..d5a37a9f66cfc19971d3340b39331191d91cad35 100644
--- a/modules/communication/liquidsoap/communicator.py
+++ b/modules/communication/liquidsoap/communicator.py
@@ -232,6 +232,7 @@ class LiquidSoapCommunicator(ExceptionLogger):
             if fade_in_time > 0:
                 self.fade_in_active = True
                 target_volume = new_entry.volume
+
                 step = fade_in_time / target_volume
 
                 self.logger.info("Starting to fading " + new_entry.type.value + " in. step is " + str(step) + "s. target volume is " + str(target_volume))
@@ -289,7 +290,10 @@ class LiquidSoapCommunicator(ExceptionLogger):
         # grab the actual active entry
         (show, old_entry) = self.scheduler.get_active_entry()
         # determine its type
-        old_type = old_entry.type
+        # FIXME Move to <get_active_entry>
+        old_type = ScheduleEntryType.FILESYSTEM
+        if old_entry:
+            old_type = old_entry.type
 
         try:
             # enable transaction
@@ -319,7 +323,7 @@ class LiquidSoapCommunicator(ExceptionLogger):
 
         # push to fs or stream
         if entry.type == ScheduleEntryType.FILESYSTEM:
-            self.playlist_push(entry.source)
+            self.playlist_push(entry.filename)
             self.active_channel = entry.type
 
         elif entry.type == ScheduleEntryType.STREAM: