diff --git a/lib/utils/exit-handler.js b/lib/utils/exit-handler.js
index b5d6cd030fb5c..25cecd170a584 100644
--- a/lib/utils/exit-handler.js
+++ b/lib/utils/exit-handler.js
@@ -131,8 +131,8 @@ const exitHandler = err => {
     log.level = level
   }
 
-  let exitCode
-  let noLogMessage
+  let exitCode = process.exitCode || 0
+  let noLogMessage = exitCode !== 0
   let jsonError
 
   if (err) {