diff --git a/app/dialogs.py b/app/dialogs.py
index a5ef62a..a05349f 100644
--- a/app/dialogs.py
+++ b/app/dialogs.py
@@ -204,12 +204,14 @@ class ReplaceFilesDialog(QDialog):
         if candidates_by_title:
             # Check artist tag
             for cbt in candidates_by_title:
+                if not os.path.exists(cbt.path):
+                    return None
                 try:
                     cbt_artist = get_tags(cbt.path)["artist"]
                     if cbt_artist.lower() == new_path_artist.lower():
                         match_track = cbt
                         break
-                except FileNotFoundError:
+                except KeyError:
                     return None
 
         return match_track
diff --git a/app/musicmuster.py b/app/musicmuster.py
index 8773fcb..055a9c2 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -1338,10 +1338,14 @@ class Window(QMainWindow, Ui_MainWindow):
                                 session.commit()
                             except IntegrityError:
                                 # https://jira.mariadb.org/browse/MDEV-29345 workaround
+                                log.debug(
+                                    "Working around https://jira.mariadb.org/browse/MDEV-29345"
+                                )
                                 session.rollback()
                                 track.path = "DUMMY"
                                 session.commit()
                                 track.path = rf.track_path
+                                session.commit()
                         else:
                             session.commit()
                     else: