v2.2.1

dherault · Mar 30, 2016 · 4322548 · 4322548
1 parent 3ff3719
commit 4322548
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-offline",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "main": "src/index.js",
   "scripts": {},

diff --git a/src/index.js b/src/index.js
@@ -485,8 +485,12 @@ module.exports = S => {
                 const x = handler(event, lambdaContext);
 
                 // Promise support
-                if (funRuntime === 'babel' && typeof x.then === 'function' && typeof x.catch === 'function') {
-                  x.then(lambdaContext.succeed).catch(lambdaContext.fail);
+                if (funRuntime === 'babel') {
+                  if (x && typeof x.then === 'function' && typeof x.catch === 'function') x
+                    .then(lambdaContext.succeed)
+                    .catch(lambdaContext.fail);
+                  else if (x instanceof Error) lambdaContext.fail(x);
+                  else lambdaContext.succeed(x);
                 }
               }
               catch(err) {