4 files changed, 23 insertions, 16 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index d5ccf56fe..a4bb72140 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -272,15 +272,13 @@ loop:
 			flush()
 		case <-runCtx.Done():
 			if !failed {
-				if utils.IsLibpodRequest(r) {
-					m.Stream = imageID
-				} else {
+				if !utils.IsLibpodRequest(r) {
 					m.Stream = fmt.Sprintf("Successfully built %12.12s\n", imageID)
+					if err := enc.Encode(m); err != nil {
+						logrus.Warnf("Failed to json encode error %q", err.Error())
+					}
+					flush()
 				}
-				if err := enc.Encode(m); err != nil {
-					logrus.Warnf("Failed to json encode error %q", err.Error())
-				}
-				flush()
 			}
 			break loop
 		}
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index 60ffea548..815ab4e86 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -187,7 +187,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 		case s.Stream != "":
 			stdout.Write([]byte(s.Stream))
 			if re.Match([]byte(s.Stream)) {
-				id = s.Stream
+				id = strings.TrimSuffix(s.Stream, "\n")
 			}
 		case s.Error != "":
 			return nil, errors.New(s.Error)
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
index 613c4a6d8..72fd98ac1 100644
--- a/pkg/domain/infra/abi/system.go
+++ b/pkg/domain/infra/abi/system.go
@@ -17,6 +17,7 @@ import (
 	"github.com/containers/podman/v2/pkg/rootless"
 	"github.com/containers/podman/v2/pkg/util"
 	"github.com/containers/podman/v2/utils"
+	"github.com/containers/storage"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -231,17 +232,25 @@ func (ic *ContainerEngine) SystemDf(ctx context.Context, options entities.System
 	dfContainers := make([]*entities.SystemDfContainerReport, 0, len(cons))
 	for _, c := range cons {
 		iid, _ := c.Image()
-		conSize, err := c.RootFsSize()
+		state, err := c.State()
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrapf(err, "Failed to get state of container %s", c.ID())
 		}
-		state, err := c.State()
+		conSize, err := c.RootFsSize()
 		if err != nil {
-			return nil, err
+			if errors.Cause(err) == storage.ErrContainerUnknown {
+				logrus.Error(errors.Wrapf(err, "Failed to get root file system size of container %s", c.ID()))
+			} else {
+				return nil, errors.Wrapf(err, "Failed to get root file system size of container %s", c.ID())
+			}
 		}
 		rwsize, err := c.RWSize()
 		if err != nil {
-			return nil, err
+			if errors.Cause(err) == storage.ErrContainerUnknown {
+				logrus.Error(errors.Wrapf(err, "Failed to get read/write size of container %s", c.ID()))
+			} else {
+				return nil, errors.Wrapf(err, "Failed to get read/write size of container %s", c.ID())
+			}
 		}
 		report := entities.SystemDfContainerReport{
 			ContainerID:  c.ID(),
diff --git a/pkg/systemd/generate/common.go b/pkg/systemd/generate/common.go
index 1fc4479ff..52a214883 100644
--- a/pkg/systemd/generate/common.go
+++ b/pkg/systemd/generate/common.go
@@ -11,13 +11,13 @@ import (
 // is set to the unit's (unique) name.
 const EnvVariable = "PODMAN_SYSTEMD_UNIT"
 
-// restartPolicies includes all valid restart policies to be used in a unit
+// RestartPolicies includes all valid restart policies to be used in a unit
 // file.
-var restartPolicies = []string{"no", "on-success", "on-failure", "on-abnormal", "on-watchdog", "on-abort", "always"}
+var RestartPolicies = []string{"no", "on-success", "on-failure", "on-abnormal", "on-watchdog", "on-abort", "always"}
 
 // validateRestartPolicy checks that the user-provided policy is valid.
 func validateRestartPolicy(restart string) error {
-	for _, i := range restartPolicies {
+	for _, i := range RestartPolicies {
 		if i == restart {
 			return nil
 		}