4 files changed, 11 insertions, 7 deletions
diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go
index 3c1943b55..6aae62dc0 100644
--- a/cmd/podman/system/events.go
+++ b/cmd/podman/system/events.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/containers/buildah/pkg/formats"
 	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/cmd/podman/validate"
 	"github.com/containers/libpod/libpod/events"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/pkg/errors"
@@ -18,7 +19,7 @@ var (
 	eventsDescription = "Monitor podman events"
 	eventsCommand     = &cobra.Command{
 		Use:   "events",
-		Args:  cobra.NoArgs,
+		Args:  validate.NoArgs,
 		Short: "Show podman events",
 		Long:  eventsDescription,
 		RunE:  eventsCmd,
diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go
index 8b36ef549..26be794c5 100644
--- a/cmd/podman/system/info.go
+++ b/cmd/podman/system/info.go
@@ -6,6 +6,7 @@ import (
 	"text/template"
 
 	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/cmd/podman/validate"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/ghodss/yaml"
 	"github.com/spf13/cobra"
@@ -18,7 +19,7 @@ var (
 `
 	infoCommand = &cobra.Command{
 		Use:     "info",
-		Args:    cobra.NoArgs,
+		Args:    validate.NoArgs,
 		Long:    infoDescription,
 		Short:   "Display podman system information",
 		RunE:    info,
diff --git a/cmd/podman/system/system.go b/cmd/podman/system/system.go
index 2d55e8c13..d9691ad2a 100644
--- a/cmd/podman/system/system.go
+++ b/cmd/podman/system/system.go
@@ -2,6 +2,7 @@ package system
 
 import (
 	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/cmd/podman/validate"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
@@ -16,7 +17,7 @@ var (
 		Short:            "Manage podman",
 		Long:             "Manage podman",
 		TraverseChildren: true,
-		RunE:             registry.SubCommandExists,
+		RunE:             validate.SubCommandExists,
 	}
 )
 
diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go
index 5d3874de3..065eef309 100644
--- a/cmd/podman/system/version.go
+++ b/cmd/podman/system/version.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/containers/buildah/pkg/formats"
 	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/cmd/podman/validate"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/pkg/errors"
@@ -19,7 +20,7 @@ import (
 var (
 	versionCommand = &cobra.Command{
 		Use:   "version",
-		Args:  cobra.NoArgs,
+		Args:  validate.NoArgs,
 		Short: "Display the Podman Version Information",
 		RunE:  version,
 		Annotations: map[string]string{
@@ -55,14 +56,14 @@ func version(cmd *cobra.Command, args []string) error {
 	// TODO we need to discuss how to implement
 	// this more. current endpoints dont have a
 	// version endpoint.  maybe we use info?
-	//if remote {
+	// if remote {
 	//	v.Server, err = getRemoteVersion(c)
 	//	if err != nil {
 	//		return err
 	//	}
-	//} else {
+	// } else {
 	v.Server = v.Client
-	//}
+	// }
 
 	versionOutputFormat := versionFormat
 	if versionOutputFormat != "" {