diff --git a/app/musicmuster.py b/app/musicmuster.py
index 56477dc..6ae1cb8 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -226,9 +226,10 @@ class Window(QMainWindow, Ui_MainWindow):
 
         # Clean up metadata
         self.previous_track = self.current_track
-        self.current_track_playlist_tab.play_stopped()
-        self.current_track_playlist_tab.clear_current()
-        self.current_track_playlist_tab = None
+        if self.current_track_playlist_tab:
+            self.current_track_playlist_tab.play_stopped()
+            self.current_track_playlist_tab.clear_current()
+            self.current_track_playlist_tab = None
         self.current_track = None
         self.playing = False
 
@@ -542,6 +543,7 @@ class Window(QMainWindow, Ui_MainWindow):
 
         if not self.music.playing():
             DEBUG("musicmuster.stop_playing(): not playing", True)
+            self.end_of_track_actions()
             return
 
         self.previous_track_position = self.music.get_position()