Merge pull request #2869 from dotcloud/fix-docker-pull-run

fix docker run on an unknown image
Upstream-commit: 18d08d0d427f6350b5742264f200475792f40c9f
Component: engine

components/engine/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
 	}