diff --git a/source/childwin.pas b/source/childwin.pas
index 67638f07..075d3122 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -5330,8 +5330,10 @@ begin
   ExpandedDBs.Free;
   TablesFetched.Free;
 
-  if oldSelectedTable <> '' then
-    SelectedTable := oldSelectedTable;
+  try
+    if oldSelectedTable <> '' then SelectedTable := oldSelectedTable;
+  except
+  end;
   DBTree.EndUpdate;
 end;