diff --git a/package.json b/package.json
index b32fd77392..1e9c8d0215 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "lru-cache": "4.0.1",
     "mailgun-js": "0.7.10",
     "mime": "1.3.4",
-    "mongodb": "2.1.18",
+    "mongodb": "2.2.4",
     "multer": "1.1.0",
     "parse": "1.9.0",
     "parse-server-fs-adapter": "1.0.0",
diff --git a/spec/index.spec.js b/spec/index.spec.js
index cb5ea1afe3..b5e4b26b36 100644
--- a/spec/index.spec.js
+++ b/spec/index.spec.js
@@ -65,7 +65,7 @@ describe('server', () => {
         expect(response.statusCode).toEqual(500);
         expect(body.code).toEqual(1);
         expect(body.message).toEqual('Internal server error.');
-        done();
+        reconfigureServer().then(done, done);
       });
     });
   });
diff --git a/src/Controllers/DatabaseController.js b/src/Controllers/DatabaseController.js
index 5272f9bfd0..cf64caa0bf 100644
--- a/src/Controllers/DatabaseController.js
+++ b/src/Controllers/DatabaseController.js
@@ -110,7 +110,8 @@ DatabaseController.prototype.validateClassName = function(className) {
 DatabaseController.prototype.loadSchema = function() {
   if (!this.schemaPromise) {
     this.schemaPromise = SchemaController.load(this.adapter);
-    this.schemaPromise.then(() => delete this.schemaPromise);
+    this.schemaPromise.then(() => delete this.schemaPromise,
+                             () => delete this.schemaPromise);
   }
   return this.schemaPromise;
 };