Merge pull request #1047 from mantidproject/catch_unhandled_exception

Catch unhandled exceptions
mantidproject · Jan 27, 2025 · 29af7b2 · 29af7b2
2 parents 6d8d676 + 2aed852
commit 29af7b2
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/mslice/models/workspacemanager/workspace_provider.py b/src/mslice/models/workspacemanager/workspace_provider.py
@@ -19,12 +19,18 @@ def add_workspace(workspace, name):
 
 
 def remove_workspace(workspace):
-    workspace = get_workspace_handle(workspace)
+    try:
+        workspace = get_workspace_handle(workspace)
+    except KeyError:
+        return
     del _loaded_workspaces[workspace.name]
 
 
 def rename_workspace(workspace, new_name):
-    workspace = get_workspace_handle(workspace)
+    try:
+        workspace = get_workspace_handle(workspace)
+    except KeyError:
+        return
     _loaded_workspaces[new_name] = _loaded_workspaces.pop(workspace.name)
     workspace.name = new_name
     return workspace
@@ -49,7 +55,7 @@ def delete_workspace(workspace):
     try:
         workspace = get_workspace_handle(workspace)
     except KeyError:
-        return None
+        return
     remove_workspace(workspace)
     del workspace