diff --git a/client.js b/client.js
index 1ceb941e..a448f2b3 100644
--- a/client.js
+++ b/client.js
@@ -495,7 +495,9 @@ CloudClient.Util        = (function(){
                         'could not be none'
             });
         
-        this.unSetCurrentFile(this.getCurrentFile());
+        var lCurrentFileWas = this.getCurrentFile();
+        if(lCurrentFileWas)        
+            this.unSetCurrentFile(lCurrentFileWas);
         
         return pCurrentFile.className = CloudCommander.CURRENT_FILE;
     };