diff --git a/lib/middleware/common.js b/lib/middleware/common.js
index d338f2b06..2a001dd35 100644
--- a/lib/middleware/common.js
+++ b/lib/middleware/common.js
@@ -16,8 +16,7 @@ class PromiseContainer {
   }
 
   then (success, error) {
-    error = error || _.noop
-    return this.promise.then(success).catch(error)
+    return this.promise.then(success, error)
   }
 
   set (newPromise) {