diff --git a/lib/client/files.js b/lib/client/files.js
index ff18d8c5..088be990 100644
--- a/lib/client/files.js
+++ b/lib/client/files.js
@@ -119,9 +119,14 @@
                 RESTful = DOM.RESTful;
             
             if (!Promises.config)
-                Promises.config = new Promise(function(resolve) {
+                Promises.config = new Promise(function(resolve, reject) {
                     is = true;
-                    RESTful.Config.read(resolve);
+                    RESTful.Config.read(function(error, data) {
+                        if (error)
+                            reject(error);
+                        else
+                            resolve(data);
+                    });
                 });
             
             Promises.config.then(function(data) {
@@ -134,6 +139,9 @@
                     if (!is)
                         Promises.config = null;
                 });
+            }, function() {
+                if (!is)
+                    Promises.config = null;
             });
         }