diff --git a/.gitignore b/.gitignore
index e05567ef..533bcfc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
+.hhconfig
+.onion
+build/
 composer.lock
-vendor/
 src/PHPBrew/
-build/
-.onion
-.hhconfig
+vendor/
+tmp/
diff --git a/composer.json b/composer.json
index 0a2147b7..8b61e9a3 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
     },
     "require-dev": {
         "corneltek/phpunit-testmore": "dev-master",
-        "satooshi/php-coveralls": "^1"
+        "satooshi/php-coveralls": "^1",
+        "phpunit/phpunit": "^5.7"
     },
     "license": "MIT",
     "authors": [
diff --git a/src/Application.php b/src/Application.php
index d214eaf0..57d61b41 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -407,7 +407,8 @@ public function run(Array $argv)
         }
         $currentCmd->finish();
         $this->finish();
-        return true;
+
+        return $return !== false;
     }
 
     /**
diff --git a/src/CommandBase.php b/src/CommandBase.php
index 018f0d5c..351438a0 100644
--- a/src/CommandBase.php
+++ b/src/CommandBase.php
@@ -814,7 +814,8 @@ public function executeWrapper(array $args)
 
                 if ($valid === FALSE) {
                     $this->logger->error($message ?: "Invalid argument $arg");
-                    return;
+
+                    return false;
                 }
             }
         }