Merge pull request #3860 from balderdashy/fix-default-handlers

[patch] Fix for issue introduced in [2037204]

lib/router/bindDefaultHandlers.js

@@ -1,3 +1,9 @@
+/**
+ * Module dependencies
+ */
+
+var _ = require('lodash');
+
 /**
  * Default 500 and 404 handler.
  * (defers to res.serverError() and res.notFound() whenever possible)
@@ -30,11 +36,16 @@ module.exports = function(sails) {
       // a `status` property of 400 as if it were intentional.  So we also check
       // the error message.  In Express 5, hopefully this can be improved a bit
       // further.
-      var msgMatches = err.message.match(/^Failed to decode param \'([^']+)\'/);
-      if (err.status === 400 && msgMatches) {
-        sails.log.verbose('Bad request: Could not decode the requested URL ('+req.path+')');
-        // Note for future: The problematic URL section is: `msgMatches[1]`
-        return res.send(400, 'Bad request: Could not decode requested URL.');
+
+      if (_.isError(err)) {
+
+        var msgMatches = err.message.match(/^Failed to decode param \'([^']+)\'/);
+        if (err.status === 400 && msgMatches) {
+          sails.log.verbose('Bad request: Could not decode the requested URL ('+req.path+')');
+          // Note for future: The problematic URL section is: `msgMatches[1]`
+          return res.send(400, 'Bad request: Could not decode requested URL.');
+        }
+
       }
 
       // Next, try to use `res.negotiate()`, if it exists and is valid.