diff --git a/cli/command/container/utils.go b/cli/command/container/utils.go
index 3652d672d9..dbd85c0a40 100644
--- a/cli/command/container/utils.go
+++ b/cli/command/container/utils.go
@@ -37,7 +37,12 @@ func waitExitOrRemoved(ctx context.Context, dockerCli command.Cli, containerID s
 	go func() {
 		select {
 		case result := <-resultC:
-			statusC <- int(result.StatusCode)
+			if result.Error != nil {
+				logrus.Errorf("Error waiting for container: %v", result.Error.Message)
+				statusC <- 125
+			} else {
+				statusC <- int(result.StatusCode)
+			}
 		case err := <-errC:
 			logrus.Errorf("error waiting for container: %v", err)
 			statusC <- 125