diff --git a/web/pgadmin/misc/file_manager/__init__.py b/web/pgadmin/misc/file_manager/__init__.py
index d788b9e03..0fe6f04bd 100644
--- a/web/pgadmin/misc/file_manager/__init__.py
+++ b/web/pgadmin/misc/file_manager/__init__.py
@@ -242,13 +242,15 @@ class Filemanager(object):
         self.trans_id = trans_id
         self.patherror = encode_json(
             {
-                'Error': gettext('No permission to operate on specified path.'),
+                'Error': gettext('No permission to operate on \
+                                  specified path.'),
                 'Code': -1
             }
         )
         self.dir = get_storage_directory()
 
-        if self.dir is not None and isinstance(self.dir, list):
+        if ((self.dir is not None and isinstance(self.dir, list)) or
+           self.dir is None):
             self.dir = ""
 
     @staticmethod