diff --git a/pkg/kubectl/cmd/config/current_context.go b/pkg/kubectl/cmd/config/current_context.go
index 83f855cffdc..eb2bb82606b 100644
--- a/pkg/kubectl/cmd/config/current_context.go
+++ b/pkg/kubectl/cmd/config/current_context.go
@@ -52,8 +52,7 @@ func NewCmdConfigCurrentContext(out io.Writer, configAccess clientcmd.ConfigAcce
 		Long:    currentContextLong,
 		Example: currentContextExample,
 		Run: func(cmd *cobra.Command, args []string) {
-			err := RunCurrentContext(out, options)
-			cmdutil.CheckErr(err)
+			cmdutil.CheckErr(RunCurrentContext(out, options))
 		},
 	}
 
diff --git a/pkg/kubectl/cmd/config/delete_cluster.go b/pkg/kubectl/cmd/config/delete_cluster.go
index 90a5f82dd8a..797fe11b8be 100644
--- a/pkg/kubectl/cmd/config/delete_cluster.go
+++ b/pkg/kubectl/cmd/config/delete_cluster.go
@@ -42,8 +42,7 @@ func NewCmdConfigDeleteCluster(out io.Writer, configAccess clientcmd.ConfigAcces
 		Long:                  "Delete the specified cluster from the kubeconfig",
 		Example:               deleteClusterExample,
 		Run: func(cmd *cobra.Command, args []string) {
-			err := runDeleteCluster(out, configAccess, cmd)
-			cmdutil.CheckErr(err)
+			cmdutil.CheckErr(runDeleteCluster(out, configAccess, cmd))
 		},
 	}
 
diff --git a/pkg/kubectl/cmd/config/delete_context.go b/pkg/kubectl/cmd/config/delete_context.go
index 6ce0d72d257..b9c6fefd7b7 100644
--- a/pkg/kubectl/cmd/config/delete_context.go
+++ b/pkg/kubectl/cmd/config/delete_context.go
@@ -42,8 +42,7 @@ func NewCmdConfigDeleteContext(out, errOut io.Writer, configAccess clientcmd.Con
 		Long:                  "Delete the specified context from the kubeconfig",
 		Example:               deleteContextExample,
 		Run: func(cmd *cobra.Command, args []string) {
-			err := runDeleteContext(out, errOut, configAccess, cmd)
-			cmdutil.CheckErr(err)
+			cmdutil.CheckErr(runDeleteContext(out, errOut, configAccess, cmd))
 		},
 	}
 
diff --git a/pkg/kubectl/cmd/config/get_clusters.go b/pkg/kubectl/cmd/config/get_clusters.go
index 83474d0e217..d8d36d916a9 100644
--- a/pkg/kubectl/cmd/config/get_clusters.go
+++ b/pkg/kubectl/cmd/config/get_clusters.go
@@ -42,8 +42,7 @@ func NewCmdConfigGetClusters(out io.Writer, configAccess clientcmd.ConfigAccess)
 		Long:    "Display clusters defined in the kubeconfig.",
 		Example: getClustersExample,
 		Run: func(cmd *cobra.Command, args []string) {
-			err := runGetClusters(out, configAccess)
-			cmdutil.CheckErr(err)
+			cmdutil.CheckErr(runGetClusters(out, configAccess))
 		},
 	}
 
diff --git a/pkg/kubectl/cmd/config/rename_context.go b/pkg/kubectl/cmd/config/rename_context.go
index c87be1e6fa9..98f078e84a5 100644
--- a/pkg/kubectl/cmd/config/rename_context.go
+++ b/pkg/kubectl/cmd/config/rename_context.go
@@ -67,15 +67,9 @@ func NewCmdConfigRenameContext(out io.Writer, configAccess clientcmd.ConfigAcces
 		Long:                  renameContextLong,
 		Example:               renameContextExample,
 		Run: func(cmd *cobra.Command, args []string) {
-			if err := options.Complete(cmd, args, out); err != nil {
-				cmdutil.CheckErr(err)
-			}
-			if err := options.Validate(); err != nil {
-				cmdutil.CheckErr(cmdutil.UsageErrorf(cmd, err.Error()))
-			}
-			if err := options.RunRenameContext(out); err != nil {
-				cmdutil.CheckErr(err)
-			}
+			cmdutil.CheckErr(options.Complete(cmd, args, out))
+			cmdutil.CheckErr(options.Validate())
+			cmdutil.CheckErr(options.RunRenameContext(out))
 		},
 	}
 	return cmd