diff --git a/cmd/deploy.go b/cmd/deploy.go
index 908e955..f38a29c 100644
--- a/cmd/deploy.go
+++ b/cmd/deploy.go
@@ -30,7 +30,8 @@ var Deploy = func(providers app.Providers) cli.Command {
 			}
 
 			if c.NArg() != 2 {
-				return cli.ShowCommandHelp(c, "deploy")
+				cli.ShowCommandHelp(c, "deploy")
+				return fmt.Errorf("invalid usage")
 			}
 			appName := c.Args().Get(0)
 			envName := c.Args().Get(1)
diff --git a/cmd/push.go b/cmd/push.go
index 4aea237..56ebab9 100644
--- a/cmd/push.go
+++ b/cmd/push.go
@@ -34,7 +34,8 @@ var Push = func(providers app.Providers) cli.Command {
 			}
 
 			if c.NArg() != 2 {
-				return cli.ShowCommandHelp(c, "push")
+				cli.ShowCommandHelp(c, "push")
+				return fmt.Errorf("invalid usage")
 			}
 			appName := c.Args().Get(0)
 			envName := c.Args().Get(1)
diff --git a/nullstone/main.go b/nullstone/main.go
index ecdf06a..e619481 100644
--- a/nullstone/main.go
+++ b/nullstone/main.go
@@ -62,6 +62,7 @@ func main() {
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
+	} else {
+		os.Exit(0)
 	}
-	os.Exit(0)
 }