diff --git a/commands.go b/commands.go
index 21b2e72c28..6f0954c42c 100644
--- a/commands.go
+++ b/commands.go
@@ -2009,8 +2009,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
 		if body, _, err = cli.call("POST", "/containers/create?"+containerValues.Encode(), config); err != nil {
 			return err
 		}
-	}
-	if err != nil {
+	} else if err != nil {
 		return err
 	}