diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go
index ef5b4be26d4c..f3a41f6b960f 100644
--- a/cmd/podman/images/history.go
+++ b/cmd/podman/images/history.go
@@ -125,7 +125,10 @@ func history(cmd *cobra.Command, args []string) error {
 	}
 	format := hdr + "{{range . }}" + row + "{{end}}"
 
-	tmpl := template.Must(template.New("report").Parse(format))
+	tmpl, err := template.New("report").Parse(format)
+	if err != nil {
+		return err
+	}
 	w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
 	err = tmpl.Execute(w, hr)
 	if err != nil {
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
index 4552901f7dea..ee0f64d993dc 100644
--- a/cmd/podman/images/list.go
+++ b/cmd/podman/images/list.go
@@ -168,7 +168,11 @@ func writeTemplate(imgs []imageReporter) error {
 		}
 	}
 	format := hdr + "{{range . }}" + row + "{{end}}"
-	tmpl := template.Must(template.New("list").Parse(format))
+	tmpl, err := template.New("list").Parse(format)
+	if err != nil {
+		return err
+	}
+	tmpl = template.Must(tmpl, nil)
 	w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
 	defer w.Flush()
 	return tmpl.Execute(w, imgs)
diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go
index 6d3d85d112b0..9010ec80346b 100644
--- a/cmd/podman/system/connection/list.go
+++ b/cmd/podman/system/connection/list.go
@@ -75,7 +75,11 @@ func list(_ *cobra.Command, _ []string) error {
 
 	// TODO: Allow user to override format
 	format := "{{range . }}{{.Name}}\t{{.Identity}}\t{{.URI}}\n{{end}}"
-	tmpl := template.Must(template.New("connection").Parse(format))
+	tmpl, err := template.New("connection").Parse(format)
+	if err != nil {
+		return err
+	}
+
 	w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
 	defer w.Flush()