diff --git a/src/Routers/FunctionsRouter.js b/src/Routers/FunctionsRouter.js
index f3ea4d3872..1bb077acd7 100644
--- a/src/Routers/FunctionsRouter.js
+++ b/src/Routers/FunctionsRouter.js
@@ -89,6 +89,9 @@ export class FunctionsRouter extends PromiseRouter {
       },
       error: function(code, message) {
         if (!message) {
+          if (code instanceof Parse.Error) {
+            return reject(code)
+          }
           message = code;
           code = Parse.Error.SCRIPT_FAILED;
         }
diff --git a/src/triggers.js b/src/triggers.js
index f8f0e6e89f..cb9d1b0caf 100644
--- a/src/triggers.js
+++ b/src/triggers.js
@@ -224,6 +224,9 @@ export function getResponseObject(request, resolve, reject) {
     },
     error: function(code, message) {
       if (!message) {
+        if (code instanceof Parse.Error) {
+          return reject(code)
+        }
         message = code;
         code = Parse.Error.SCRIPT_FAILED;
       }