diff --git a/cli/command/stack/kubernetes/ps.go b/cli/command/stack/kubernetes/ps.go
index 1895ac7cd7..a4ee14f636 100644
--- a/cli/command/stack/kubernetes/ps.go
+++ b/cli/command/stack/kubernetes/ps.go
@@ -68,7 +68,7 @@ func printTasks(dockerCli command.Cli, options options.PS, namespace string, cli
 	names := map[string]string{}
 	nodes := map[string]string{}
 
-	n, err := client.Nodes().List(metav1.ListOptions{})
+	n, err := listNodes(client, options.NoResolve)
 	if err != nil {
 		return err
 	}
@@ -103,3 +103,10 @@ func resolveNode(name string, nodes *apiv1.NodeList, noResolve bool) (string, er
 	}
 	return name, nil
 }
+
+func listNodes(client corev1.NodesGetter, noResolve bool) (*apiv1.NodeList, error) {
+	if noResolve {
+		return client.Nodes().List(metav1.ListOptions{})
+	}
+	return nil, nil
+}
diff --git a/cli/command/stack/kubernetes/remove.go b/cli/command/stack/kubernetes/remove.go
index af68db7f30..311c7597af 100644
--- a/cli/command/stack/kubernetes/remove.go
+++ b/cli/command/stack/kubernetes/remove.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/docker/cli/cli/command/stack/options"
+	"github.com/pkg/errors"
 )
 
 // RunRemove is the kubernetes implementation of docker stack remove
@@ -18,10 +19,8 @@ func RunRemove(dockerCli *KubeCli, opts options.Remove) error {
 	}
 	for _, stack := range opts.Namespaces {
 		fmt.Fprintf(dockerCli.Out(), "Removing stack: %s\n", stack)
-		err := stacks.Delete(stack)
-		if err != nil {
-			fmt.Fprintf(dockerCli.Out(), "Failed to remove stack %s: %s\n", stack, err)
-			return err
+		if err := stacks.Delete(stack); err != nil {
+			return errors.Wrapf(err, "Failed to remove stack %s", stack)
 		}
 	}
 	return nil