11 files changed, 21 insertions, 4 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 2e9586b60..30eaa95d8 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -67,6 +67,16 @@ func noSubArgs(c *cobra.Command, args []string) error {
 	return nil
 }
 
+func commandRunE() func(*cobra.Command, []string) error {
+	return func(cmd *cobra.Command, args []string) error {
+		if len(args) > 0 {
+			return errors.Errorf("unrecognized command `%s %s`\nTry '%s --help' for more information.", cmd.CommandPath(), args[0], cmd.CommandPath())
+		} else {
+			return errors.Errorf("missing command '%s COMMAND'\nTry '%s --help' for more information.", cmd.CommandPath(), cmd.CommandPath())
+		}
+	}
+}
+
 // getAllOrLatestContainers tries to return the correct list of containers
 // depending if --all, --latest or <container-id> is used.
 // It requires the Context (c) and the Runtime (runtime). As different
@@ -537,7 +547,7 @@ Description:
 // This blocks the desplaying of the global options. The main podman
 // command should not use this.
 func UsageTemplate() string {
-	return `Usage:{{if .Runnable}}
+	return `Usage:{{if (and .Runnable (not .HasAvailableSubCommands))}}
   {{.UseLine}}{{end}}{{if .HasAvailableSubCommands}}
   {{.CommandPath}} [command]{{end}}{{if gt (len .Aliases) 0}}
 
diff --git a/cmd/podman/container.go b/cmd/podman/container.go
index 0bcdf533a..8ad8d7a44 100644
--- a/cmd/podman/container.go
+++ b/cmd/podman/container.go
@@ -15,6 +15,7 @@ var (
 			Short:            "Manage Containers",
 			Long:             containerDescription,
 			TraverseChildren: true,
+			RunE:             commandRunE(),
 		},
 	}
 
diff --git a/cmd/podman/generate.go b/cmd/podman/generate.go
index 773d625ee..197fd26a6 100644
--- a/cmd/podman/generate.go
+++ b/cmd/podman/generate.go
@@ -12,6 +12,7 @@ var (
 		Use:   "generate",
 		Short: "Generated structured data",
 		Long:  generateDescription,
+		RunE:  commandRunE(),
 	}
 )
 
diff --git a/cmd/podman/healthcheck.go b/cmd/podman/healthcheck.go
index e7cc125cc..48d6b6bbf 100644
--- a/cmd/podman/healthcheck.go
+++ b/cmd/podman/healthcheck.go
@@ -11,6 +11,7 @@ var healthcheckCommand = cliconfig.PodmanCommand{
 		Use:   "healthcheck",
 		Short: "Manage Healthcheck",
 		Long:  healthcheckDescription,
+		RunE:  commandRunE(),
 	},
 }
 
diff --git a/cmd/podman/image.go b/cmd/podman/image.go
index 57be7fe14..52bac6ecb 100644
--- a/cmd/podman/image.go
+++ b/cmd/podman/image.go
@@ -14,6 +14,7 @@ var (
 			Use:   "image",
 			Short: "Manage images",
 			Long:  imageDescription,
+			RunE:  commandRunE(),
 		},
 	}
 	imagesSubCommand  cliconfig.ImagesValues
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 97ffa8930..7d4b650a9 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -82,9 +82,7 @@ var cmdsNotRequiringRootless = map[*cobra.Command]bool{
 var rootCmd = &cobra.Command{
 	Use:  "podman",
 	Long: "manage pods and images",
-	RunE: func(cmd *cobra.Command, args []string) error {
-		return cmd.Help()
-	},
+	RunE: commandRunE(),
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 		return before(cmd, args)
 	},
diff --git a/cmd/podman/play.go b/cmd/podman/play.go
index 2a0c41ef6..95eae653e 100644
--- a/cmd/podman/play.go
+++ b/cmd/podman/play.go
@@ -12,6 +12,7 @@ var (
 		Use:   "play",
 		Short: "Play a pod",
 		Long:  playDescription,
+		RunE:  commandRunE(),
 	}
 )
 
diff --git a/cmd/podman/pod.go b/cmd/podman/pod.go
index 315b2e7bc..2d9bca21d 100644
--- a/cmd/podman/pod.go
+++ b/cmd/podman/pod.go
@@ -13,6 +13,7 @@ var podCommand = cliconfig.PodmanCommand{
 		Use:   "pod",
 		Short: "Manage pods",
 		Long:  podDescription,
+		RunE:  commandRunE(),
 	},
 }
 
diff --git a/cmd/podman/system.go b/cmd/podman/system.go
index 741b79da5..528a594de 100644
--- a/cmd/podman/system.go
+++ b/cmd/podman/system.go
@@ -13,6 +13,7 @@ var (
 			Use:   "system",
 			Short: "Manage podman",
 			Long:  systemDescription,
+			RunE:  commandRunE(),
 		},
 	}
 )
diff --git a/cmd/podman/trust.go b/cmd/podman/trust.go
index a412e9483..0a79e1570 100644
--- a/cmd/podman/trust.go
+++ b/cmd/podman/trust.go
@@ -14,6 +14,7 @@ var (
 			Use:   "trust",
 			Short: "Manage container image trust policy",
 			Long:  trustDescription,
+			RunE:  commandRunE(),
 		},
 	}
 )
diff --git a/cmd/podman/volume.go b/cmd/podman/volume.go
index efc0d7ac9..2a071d0c7 100644
--- a/cmd/podman/volume.go
+++ b/cmd/podman/volume.go
@@ -12,6 +12,7 @@ var volumeCommand = cliconfig.PodmanCommand{
 		Use:   "volume",
 		Short: "Manage volumes",
 		Long:  volumeDescription,
+		RunE:  commandRunE(),
 	},
 }
 var volumeSubcommands = []*cobra.Command{