Merge pull request #117 from zapier/err-handling

fix null error handling
zapier · Oct 10, 2018 · 0506544 · 0506544
2 parents cc3b638 + e437874
commit 0506544
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/tools/create-lambda-handler.js b/src/tools/create-lambda-handler.js
@@ -169,10 +169,10 @@ const createLambdaHandler = appRawOrPath => {
       // the default behavior with callbacks anyway, but don't want
       // to rely on that.
       logger(logMsg, logData).then(() => {
-        if (!constants.IS_TESTING) {
-          err.message +=
-            '\n\nConsole logs:\n' +
-            logBuffer.map(s => `  ${s.message}`).join('');
+        if (!constants.IS_TESTING && err) {
+          err.message += `\n\nConsole logs:\n${logBuffer
+            .map(s => `  ${s.message}`)
+            .join('')}`;
         }
         callbackOnce(err);
       });
@@ -181,7 +181,8 @@ const createLambdaHandler = appRawOrPath => {
     const handlerDomain = domain.create();
 
     handlerDomain.on('error', err => {
-      const logMsg = `Uncaught error: ${err}\n${err.stack || '<stack>'}`;
+      const logMsg = `Uncaught error: ${err}\n${(err && err.stack) ||
+        '<stack>'}`;
       const logData = { err, log_type: 'error' };
       logErrorAndCallbackOnce(logMsg, logData, err);
     });
@@ -208,7 +209,8 @@ const createLambdaHandler = appRawOrPath => {
           callbackOnce(null, cleaner.maskOutput(output));
         })
         .catch(err => {
-          const logMsg = `Unhandled error: ${err}\n${err.stack || '<stack>'}`;
+          const logMsg = `Unhandled error: ${err}\n${(err && err.stack) ||
+            '<stack>'}`;
           const logData = { err, log_type: 'error' };
           logErrorAndCallbackOnce(logMsg, logData, err);
         });