2 files changed, 23 insertions, 9 deletions
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go
index 3a7662c41..31435ae91 100644
--- a/pkg/bindings/connection.go
+++ b/pkg/bindings/connection.go
@@ -214,19 +214,23 @@ func sshClient(_url *url.URL, secure bool, passPhrase string, identity string) (
 		authMethods = append(authMethods, ssh.Password(string(pass)))
 	}
 
+	port := _url.Port()
+	if port == "" {
+		port = "22"
+	}
+
 	callback := ssh.InsecureIgnoreHostKey()
 	if secure {
-		key := terminal.HostKey(_url.Hostname())
+		host := _url.Hostname()
+		if port != "22" {
+			host = fmt.Sprintf("[%s]:%s", host, port)
+		}
+		key := terminal.HostKey(host)
 		if key != nil {
 			callback = ssh.FixedHostKey(key)
 		}
 	}
 
-	port := _url.Port()
-	if port == "" {
-		port = "22"
-	}
-
 	bastion, err := ssh.Dial("tcp",
 		net.JoinHostPort(_url.Hostname(), port),
 		&ssh.ClientConfig{
diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go
index 3e47dc67a..281b04294 100644
--- a/pkg/domain/infra/abi/images_list.go
+++ b/pkg/domain/infra/abi/images_list.go
@@ -5,6 +5,7 @@ import (
 
 	libpodImage "github.com/containers/podman/v2/libpod/image"
 	"github.com/containers/podman/v2/pkg/domain/entities"
+	"github.com/pkg/errors"
 )
 
 func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ([]*entities.ImageSummary, error) {
@@ -43,12 +44,21 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
 			VirtualSize:  img.VirtualSize,
 			RepoTags:     img.Names(), // may include tags and digests
 		}
-		e.Labels, _ = img.Labels(context.TODO())
+		e.Labels, err = img.Labels(ctx)
+		if err != nil {
+			return nil, errors.Wrapf(err, "error retrieving label for image %q: you may need to remove the image to resolve the error", img.ID())
+		}
 
-		ctnrs, _ := img.Containers()
+		ctnrs, err := img.Containers()
+		if err != nil {
+			return nil, errors.Wrapf(err, "error retrieving containers for image %q: you may need to remove the image to resolve the error", img.ID())
+		}
 		e.Containers = len(ctnrs)
 
-		sz, _ := img.Size(context.TODO())
+		sz, err := img.Size(ctx)
+		if err != nil {
+			return nil, errors.Wrapf(err, "error retrieving size of image %q: you may need to remove the image to resolve the error", img.ID())
+		}
 		e.Size = int64(*sz)
 
 		summaries = append(summaries, &e)