diff --git a/src/Files.App/Utils/Library/LibraryManager.cs b/src/Files.App/Utils/Library/LibraryManager.cs
index a3520eb6122b..937ed51096e4 100644
--- a/src/Files.App/Utils/Library/LibraryManager.cs
+++ b/src/Files.App/Utils/Library/LibraryManager.cs
@@ -382,7 +382,12 @@ private void OnLibraryChanged(WatcherChangeTypes changeType, string oldPath, str
 					return;
 				}
 
-				var library1 = ShellFolderExtensions.GetShellLibraryItem(library, newPath);
+				var library1 = SafetyExtensions.IgnoreExceptions(() => ShellFolderExtensions.GetShellLibraryItem(library, newPath));
+				if (library1 is null)
+				{
+					App.Logger.LogWarning($"Failed to open library after {changeType}: {newPath}");
+					return;
+				}
 
 				string? path = oldPath;
 				if (string.IsNullOrEmpty(oldPath))