diff --git a/cmd/gitops-pusher/gitops-pusher.go b/cmd/gitops-pusher/gitops-pusher.go
index 60bee6064d439..55558a1f83f63 100644
--- a/cmd/gitops-pusher/gitops-pusher.go
+++ b/cmd/gitops-pusher/gitops-pusher.go
@@ -11,6 +11,7 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/json"
+	"errors"
 	"flag"
 	"fmt"
 	"log"
@@ -216,6 +217,14 @@ func main() {
 	}
 
 	if err := root.Parse(os.Args[1:]); err != nil {
+		if noexec := (ffcli.NoExecError{}); errors.As(err, &noexec) {
+			if args := noexec.Command.FlagSet.Args(); len(args) > 0 {
+				log.Fatalf("invalid subcommand %s, see -help for available subcommands", args[0])
+			} else {
+				log.Fatal("missing subcommand, see -help for available subcommands")
+			}
+		}
+
 		log.Fatal(err)
 	}