diff --git a/cmd/picoclaw/cmd_agent.go b/cmd/picoclaw/cmd_agent.go
index 98ea51103..d33cf0c3b 100644
--- a/cmd/picoclaw/cmd_agent.go
+++ b/cmd/picoclaw/cmd_agent.go
@@ -46,6 +46,10 @@ func agentCmd() {
 				modelOverride = args[i+1]
 				i++
 			}
+		default:
+			fmt.Printf("Unknown flag: %s\n", args[i])
+			printHelp()
+			os.Exit(1)
 		}
 	}
 
diff --git a/cmd/picoclaw/cmd_auth.go b/cmd/picoclaw/cmd_auth.go
index 55eb3cec3..3fddeb02a 100644
--- a/cmd/picoclaw/cmd_auth.go
+++ b/cmd/picoclaw/cmd_auth.go
@@ -75,6 +75,10 @@ func authLoginCmd() {
 			}
 		case "--device-code":
 			useDeviceCode = true
+		default:
+			fmt.Printf("Unknown flag: %s\n", args[i])
+			authHelp()
+			os.Exit(1)
 		}
 	}
 
@@ -334,6 +338,10 @@ func authLogoutCmd() {
 				provider = args[i+1]
 				i++
 			}
+		default:
+			fmt.Printf("Unknown flag: %s\n", args[i])
+			authHelp()
+			os.Exit(1)
 		}
 	}
 
diff --git a/cmd/picoclaw/cmd_cron.go b/cmd/picoclaw/cmd_cron.go
index 8c42bde06..3fc264687 100644
--- a/cmd/picoclaw/cmd_cron.go
+++ b/cmd/picoclaw/cmd_cron.go
@@ -153,6 +153,10 @@ func cronAddCmd(storePath string) {
 				channel = args[i+1]
 				i++
 			}
+		default:
+			fmt.Printf("Unknown flag: %s\n", args[i])
+			cronHelp()
+			os.Exit(1)
 		}
 	}
 
diff --git a/cmd/picoclaw/cmd_gateway.go b/cmd/picoclaw/cmd_gateway.go
index 3010c1451..aa3a2657b 100644
--- a/cmd/picoclaw/cmd_gateway.go
+++ b/cmd/picoclaw/cmd_gateway.go
@@ -29,13 +29,16 @@ import (
 )
 
 func gatewayCmd() {
-	// Check for --debug flag
 	args := os.Args[2:]
-	for _, arg := range args {
-		if arg == "--debug" || arg == "-d" {
+	for i := 0; i < len(args); i++ {
+		switch args[i] {
+		case "--debug", "-d":
 			logger.SetLevel(logger.DEBUG)
 			fmt.Println("🔍 Debug mode enabled")
-			break
+		default:
+			fmt.Printf("Unknown flag: %s\n", args[i])
+			printHelp()
+			os.Exit(1)
 		}
 	}