diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
index 225204347..c86e47ab4 100644
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -193,6 +193,11 @@ const ObjectManager = new Lang.Class({
 
             let [objects] = result;
 
+            if (!objects) {
+                this._tryToCompleteLoad();
+                return;
+            }
+
             let objectPaths = Object.keys(objects);
             for (let i = 0; i < objectPaths.length; i++) {
                 let objectPath = objectPaths[i];