diff --git a/api/client/container/attach.go b/api/client/container/attach.go
index 0efbec820e..8c8d675169 100644
--- a/api/client/container/attach.go
+++ b/api/client/container/attach.go
@@ -36,7 +36,6 @@ func NewAttachCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runAttach(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	flags := cmd.Flags()
 	flags.BoolVar(&opts.noStdin, "no-stdin", false, "Do not attach STDIN")
diff --git a/api/client/container/commit.go b/api/client/container/commit.go
index ddbe61a87b..34f5c230a5 100644
--- a/api/client/container/commit.go
+++ b/api/client/container/commit.go
@@ -41,7 +41,6 @@ func NewCommitCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runCommit(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	flags := cmd.Flags()
 	flags.SetInterspersed(false)
diff --git a/api/client/container/create.go b/api/client/container/create.go
index 5038324a2b..a5e90d636c 100644
--- a/api/client/container/create.go
+++ b/api/client/container/create.go
@@ -43,7 +43,6 @@ func NewCreateCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runCreate(dockerCli, cmd.Flags(), &opts, copts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	flags := cmd.Flags()
 	flags.SetInterspersed(false)
diff --git a/api/client/container/diff.go b/api/client/container/diff.go
index 5fdaeadd38..b0ae915d7c 100644
--- a/api/client/container/diff.go
+++ b/api/client/container/diff.go
@@ -28,7 +28,6 @@ func NewDiffCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runDiff(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	return cmd
 }
diff --git a/api/client/container/logs.go b/api/client/container/logs.go
index a4b1c46dd8..d0c7c03d2f 100644
--- a/api/client/container/logs.go
+++ b/api/client/container/logs.go
@@ -41,7 +41,6 @@ func NewLogsCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runLogs(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	flags := cmd.Flags()
 	flags.BoolVarP(&opts.follow, "follow", "f", false, "Follow log output")
diff --git a/api/client/container/pause.go b/api/client/container/pause.go
index b86a576874..fe170455c6 100644
--- a/api/client/container/pause.go
+++ b/api/client/container/pause.go
@@ -28,7 +28,6 @@ func NewPauseCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runPause(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	return cmd
 }
diff --git a/api/client/container/port.go b/api/client/container/port.go
index 3594eb0c8d..1a12528d36 100644
--- a/api/client/container/port.go
+++ b/api/client/container/port.go
@@ -34,7 +34,6 @@ func NewPortCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runPort(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	return cmd
 }
diff --git a/api/client/container/rename.go b/api/client/container/rename.go
index 41b98166b6..dcb04469e1 100644
--- a/api/client/container/rename.go
+++ b/api/client/container/rename.go
@@ -30,7 +30,6 @@ func NewRenameCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runRename(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	return cmd
 }
diff --git a/api/client/container/run.go b/api/client/container/run.go
index 7c2a90fd1f..fe87ccb51c 100644
--- a/api/client/container/run.go
+++ b/api/client/container/run.go
@@ -54,7 +54,6 @@ func NewRunCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runRun(dockerCli, cmd.Flags(), &opts, copts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	flags := cmd.Flags()
 	flags.SetInterspersed(false)
@@ -75,13 +74,6 @@ func NewRunCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func flagErrorFunc(cmd *cobra.Command, err error) error {
-	return cli.StatusError{
-		Status:     cli.FlagErrorFunc(cmd, err).Error(),
-		StatusCode: 125,
-	}
-}
-
 func runRun(dockerCli *client.DockerCli, flags *pflag.FlagSet, opts *runOptions, copts *runconfigopts.ContainerOptions) error {
 	stdout, stderr, stdin := dockerCli.Out(), dockerCli.Err(), dockerCli.In()
 	client := dockerCli.Client()
diff --git a/api/client/container/start.go b/api/client/container/start.go
index df955d2816..97f4a7a631 100644
--- a/api/client/container/start.go
+++ b/api/client/container/start.go
@@ -37,7 +37,6 @@ func NewStartCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runStart(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	flags := cmd.Flags()
 	flags.BoolVarP(&opts.attach, "attach", "a", false, "Attach STDOUT/STDERR and forward signals")
diff --git a/api/client/container/stop.go b/api/client/container/stop.go
index b05b0e3dfe..cf2dc25839 100644
--- a/api/client/container/stop.go
+++ b/api/client/container/stop.go
@@ -31,7 +31,6 @@ func NewStopCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runStop(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	flags := cmd.Flags()
 	flags.IntVarP(&opts.time, "time", "t", 10, "Seconds to wait for stop before killing it")
diff --git a/api/client/container/top.go b/api/client/container/top.go
index e31a903adc..3ade5fbd6d 100644
--- a/api/client/container/top.go
+++ b/api/client/container/top.go
@@ -32,7 +32,6 @@ func NewTopCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runTop(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	flags := cmd.Flags()
 	flags.SetInterspersed(false)
diff --git a/api/client/container/unpause.go b/api/client/container/unpause.go
index 3d178a0064..75e2ff94ae 100644
--- a/api/client/container/unpause.go
+++ b/api/client/container/unpause.go
@@ -28,7 +28,6 @@ func NewUnpauseCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runUnpause(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	return cmd
 }
diff --git a/api/client/container/wait.go b/api/client/container/wait.go
index 4b6be886e8..297cabd147 100644
--- a/api/client/container/wait.go
+++ b/api/client/container/wait.go
@@ -28,7 +28,6 @@ func NewWaitCommand(dockerCli *client.DockerCli) *cobra.Command {
 			return runWait(dockerCli, &opts)
 		},
 	}
-	cmd.SetFlagErrorFunc(flagErrorFunc)
 
 	return cmd
 }
diff --git a/cli/flagerrors.go b/cli/flagerrors.go
index aab8a98845..23225e8ad6 100644
--- a/cli/flagerrors.go
+++ b/cli/flagerrors.go
@@ -17,5 +17,8 @@ func FlagErrorFunc(cmd *cobra.Command, err error) error {
 	if cmd.HasSubCommands() {
 		usage = "\n\n" + cmd.UsageString()
 	}
-	return fmt.Errorf("%s\nSee '%s --help'.%s", err, cmd.CommandPath(), usage)
+	return StatusError{
+		Status:     fmt.Sprintf("%s\nSee '%s --help'.%s", err, cmd.CommandPath(), usage),
+		StatusCode: 125,
+	}
 }