@@ -63,7 +63,6 @@ func (cli *DockerCli) CmdHelp(args ...string) error {

 	if len(args) > 0 {

 		method, exists := cli.getMethod(args[0])

 		if !exists {

-			fmt.Fprintf(cli.err, "Error: Command not found: %s\n", args[0])

 			fmt.Fprintf(cli.err, "docker: '%s' is not a docker command. See 'docker --help'.\n", args[0])

 			os.Exit(1)

 		} else {

@@ -26,9 +26,9 @@ func ParseFlags(cmd *flag.FlagSet, args []string, withHelp bool) error {

 	if str := cmd.CheckArgs(); str != "" {

 		if withHelp {

 			if os.Args[0] == cmd.Name() {

-				str += ". See '" + os.Args[0] + " " + cmd.Name() + " --help'"

-			} else {

 				str += ". See '" + os.Args[0] + " --help'"

+			} else {

+				str += ". See '" + os.Args[0] + " " + cmd.Name() + " --help'"

 			}

 		}

 		fmt.Fprintf(cmd.Out(), "docker: %s.\n", str)