Swallow error by locally passed errorHandler option

gitterHQ · Nov 16, 2016 · 627cd11 · 627cd11
1 parent 5671155
commit 627cd11
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -157,9 +157,14 @@ Client.prototype = {
 
     });
 
-    /* Custom error handler */
-    if (!options.disableErrorHandler && this.errorHandler) {
-      return promise.catch(this.errorHandler);
+    // Try the local error handler
+    if (options.errorHandler) {
+      promise = promise.catch(options.errorHandler);
+    }
+
+    // Fallback to the global error handler
+    if (this.errorHandler) {
+      promise = promise.catch(this.errorHandler);
     }
 
     return promise;