diff --git a/src/cli.js b/src/cli.js
index f74db7ea9..4a3a2da9d 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -140,6 +140,7 @@ module.exports = function (inputArgs) {
 function printHelp (command) {
     const result = help([command]);
     cordova.emit('results', result);
+    return result;
 }
 
 function cli (inputArgs) {
@@ -154,6 +155,15 @@ function cli (inputArgs) {
         process.exit(1);
     });
 
+    process.on('unhandledRejection', function (reason) {
+        const msg = reason instanceof Error ? reason.message : String(reason);
+        logger.error(msg);
+        if (reason instanceof Error) {
+            events.emit('verbose', reason.stack);
+        }
+        process.exit(1);
+    });
+
     logger.subscribe(events);
 
     if (args.silent) {