diff --git a/www/fileSystems-roots.js b/www/fileSystems-roots.js
index 9a3fc7a08..b15adbd75 100644
--- a/www/fileSystems-roots.js
+++ b/www/fileSystems-roots.js
@@ -30,8 +30,10 @@ require('./fileSystems').getFs = function (name, callback) {
         fsMap = {};
         for (var i = 0; i < response.length; ++i) {
             var fsRoot = response[i];
-            var fs = new FileSystem(fsRoot.filesystemName, fsRoot);
-            fsMap[fs.name] = fs;
+            if (fsRoot) {
+                var fs = new FileSystem(fsRoot.filesystemName, fsRoot);
+                fsMap[fs.name] = fs;
+            }
         }
         callback(fsMap[name]);
     }