diff --git a/cmd/buildpack/main.go b/cmd/buildpack/main.go
index 9dbc7b3..9187bef 100644
--- a/cmd/buildpack/main.go
+++ b/cmd/buildpack/main.go
@@ -159,7 +159,11 @@ func (s *server) serveBuildpackManifest(w http.ResponseWriter, r *http.Request)
 	}
 
 	// Serve the manifest.
-	serve.Manifest(w, r, img)
+	if err := serve.Manifest(w, r, img); err != nil {
+		s.error.Printf("ERROR (serve.Manifest): %v", err)
+		serve.Error(w, err)
+		return
+	}
 }
 
 type cachedManifest struct {
diff --git a/cmd/ko/main.go b/cmd/ko/main.go
index 794e2e0..528ce35 100644
--- a/cmd/ko/main.go
+++ b/cmd/ko/main.go
@@ -125,5 +125,9 @@ func (s *server) serveKoManifest(w http.ResponseWriter, r *http.Request) {
 		serve.Error(w, serve.ErrInvalid)
 		return
 	}
-	serve.Manifest(w, r, img)
+	if err := serve.Manifest(w, r, img); err != nil {
+		s.error.Printf("ERROR (serve.Manifest): %v", err)
+		serve.Error(w, err)
+		return
+	}
 }
diff --git a/cmd/mirror/main.go b/cmd/mirror/main.go
index 990bf8d..1bc20c7 100644
--- a/cmd/mirror/main.go
+++ b/cmd/mirror/main.go
@@ -120,7 +120,7 @@ func (s *server) serveMirrorManifest(w http.ResponseWriter, r *http.Request) {
 				return
 			}
 			if err := serve.Manifest(w, r, img); err != nil {
-				s.error.Printf("ERROR (serve.Index): %v", err)
+				s.error.Printf("ERROR (serve.Manifest): %v", err)
 				serve.Error(w, err)
 				return
 			}
diff --git a/cmd/random/main.go b/cmd/random/main.go
index 46e6828..65521b5 100644
--- a/cmd/random/main.go
+++ b/cmd/random/main.go
@@ -83,5 +83,9 @@ func (s *server) serveRandomManifest(w http.ResponseWriter, r *http.Request) {
 		serve.Error(w, err)
 		return
 	}
-	serve.Manifest(w, r, img)
+	if err := serve.Manifest(w, r, img); err != nil {
+		s.error.Printf("ERROR (serve.Manifest): %v", err)
+		serve.Error(w, err)
+		return
+	}
 }