diff --git a/cli/cmd/rm.go b/cli/cmd/rm.go
index 6d7452f8f..f63866f2d 100644
--- a/cli/cmd/rm.go
+++ b/cli/cmd/rm.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/pkg/errors"
@@ -23,22 +24,7 @@ func RmCommand() *cobra.Command {
 		Short:   "Remove containers",
 		Args:    cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			c, err := client.New(cmd.Context())
-			if err != nil {
-				return errors.Wrap(err, "cannot connect to backend")
-			}
-
-			var errs *multierror.Error
-			for _, id := range args {
-				err := c.ContainerService().Delete(cmd.Context(), id, opts.force)
-				if err != nil {
-					errs = multierror.Append(errs, err)
-					continue
-				}
-				fmt.Println(id)
-			}
-
-			return errs.ErrorOrNil()
+			return runRm(cmd.Context(), args, opts)
 		},
 	}
 
@@ -46,3 +32,22 @@ func RmCommand() *cobra.Command {
 
 	return cmd
 }
+
+func runRm(ctx context.Context, args []string, opts rmOpts) error {
+	c, err := client.New(ctx)
+	if err != nil {
+		return errors.Wrap(err, "cannot connect to backend")
+	}
+
+	var errs *multierror.Error
+	for _, id := range args {
+		err := c.ContainerService().Delete(ctx, id, opts.force)
+		if err != nil {
+			errs = multierror.Append(errs, err)
+			continue
+		}
+		fmt.Println(id)
+	}
+
+	return errs.ErrorOrNil()
+}
diff --git a/cli/cmd/run/run.go b/cli/cmd/run/run.go
index b28b6de71..656e774a0 100644
--- a/cli/cmd/run/run.go
+++ b/cli/cmd/run/run.go
@@ -46,11 +46,7 @@ func Command() *cobra.Command {
 		Short: "Run a container",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := runRun(cmd.Context(), args[0], opts); err != nil {
-				return err
-			}
-			fmt.Println(opts.name)
-			return nil
+			return runRun(cmd.Context(), args[0], opts)
 		},
 	}
 
@@ -71,7 +67,12 @@ func runRun(ctx context.Context, image string, opts runOpts) error {
 		return err
 	}
 
-	return c.ContainerService().Run(ctx, project)
+	if err = c.ContainerService().Run(ctx, project); err != nil {
+		return err
+	}
+	fmt.Println(opts.name)
+	return nil
+
 }
 
 func getRandomName() string {