diff --git a/cmd/jira/main.go b/cmd/jira/main.go
index 16241e44..d5979b3c 100644
--- a/cmd/jira/main.go
+++ b/cmd/jira/main.go
@@ -271,8 +271,12 @@ func main() {
 		}
 		panic(jiracli.Exit{Code: 1})
 	})
-	_, err := app.Parse(os.Args[1:])
-	if err != nil {
-		log.Fatalf("%s", err)
+	if _, err := app.Parse(os.Args[1:]); err != nil {
+		ctx, _ := app.ParseContext(os.Args[1:])
+		if ctx != nil {
+			app.UsageForContext(ctx)
+		}
+		log.Errorf("Invalid Usage: %s", err)
+		panic(jiracli.Exit{Code: 1})
 	}
 }