Fix #1517

src/promise.js

@@ -102,6 +102,11 @@ Promise.prototype.caught = Promise.prototype["catch"] = function (fn) {
         }
         catchInstances.length = j;
         fn = arguments[i];
+
+        if (typeof fn !== "function") {
+            throw new TypeError("The last argument to .catch() " +
+                "must be a function, got " + util.toString(fn));
+        }
         return this.then(undefined, catchFilter(catchInstances, fn, this));
     }
     return this.then(undefined, fn);

test/mocha/catch_filter.js

@@ -288,6 +288,20 @@ describe("A promise handler that is caught in a filter", function() {
          });
 
     });
+
+    specify("should throw type error for not passing function", function() {
+        try {
+            var a = Promise.reject(new Error("asd"));
+            a.caught(Promise.TypeError, "string");
+            throw new Error("fail");
+        } catch (e) {
+            if (e instanceof Promise.TypeError) {
+                return true;
+            } else {
+                throw new Error("fail");
+            }
+        }
+    });
 });
 
 describe("A promise handler with a predicate filter", function() {