1 files changed, 5 insertions, 1 deletions
diff --git a/Software/Visual_Studio/Tango.Explorer/ExplorerControl.cs b/Software/Visual_Studio/Tango.Explorer/ExplorerControl.cs
index 197380475..d84138e0f 100644
--- a/Software/Visual_Studio/Tango.Explorer/ExplorerControl.cs
+++ b/Software/Visual_Studio/Tango.Explorer/ExplorerControl.cs
@@ -77,7 +77,11 @@ namespace Tango.Explorer
 
             _changing_current_path = true;
 
-            if (Directory.Exists(CurrentPath))
+            if (CurrentPath == null)
+            {
+                CurrentFolder = null;
+            }
+            else if (Directory.Exists(CurrentPath))
             {
                 CurrentFolder = ExplorerFolderItem.LoadFromPath(CurrentPath);
             }