diff --git a/app/playlists.py b/app/playlists.py
index 06eae60..bdbe2ae 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -718,7 +718,11 @@ class PlaylistTab(QTableWidget):
         - Update display
         """
 
-        search_from = self._get_current_track_row_number() + 1
+        current_row = self._get_current_track_row_number()
+        if not current_row:
+            return
+
+        search_from = current_row + 1
 
         # Mark current row as played
         self._set_played_row(session, current_row)
@@ -744,6 +748,9 @@ class PlaylistTab(QTableWidget):
 
         # Add the rows
         playlist = session.get(Playlists, playlist_id)
+        if not playlist:
+            return
+
         for plr in playlist.rows:
             self.insert_row(session, plr, repaint=False)