diff --git a/cmd/goa/main.go b/cmd/goa/main.go
index f7f339439b..d5b3ba068a 100644
--- a/cmd/goa/main.go
+++ b/cmd/goa/main.go
@@ -20,6 +20,7 @@ func main() {
 	{
 		if len(os.Args) == 1 {
 			usage()
+			return
 		}
 
 		switch os.Args[1] {
@@ -29,12 +30,14 @@ func main() {
 		case "gen", "example":
 			if len(os.Args) == 2 {
 				usage()
+				return
 			}
 			cmd = os.Args[1]
 			path = os.Args[2]
 			offset = 2
 		default:
 			usage()
+			return
 		}
 	}