diff --git a/server/go/camlistored/image.go b/server/go/camlistored/image.go
index 2279d31a6..153c1ead9 100644
--- a/server/go/camlistored/image.go
+++ b/server/go/camlistored/image.go
@@ -68,7 +68,11 @@ func (ih *ImageHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request, fil
 
 	var buf bytes.Buffer
 	n, err := io.Copy(&buf, fr)
-	i, format, err := image.Decode(&buf)
+	if err != nil {
+		log.Printf("image resize: error reading image %s: %v", file, err)
+		return
+	}
+	i, format, err := image.Decode(bytes.NewBuffer(buf.Bytes()))
 	if err != nil {
 		http.Error(rw, "Can't serve file: "+err.String(), 500)
 		return
diff --git a/server/go/camlistored/publish.go b/server/go/camlistored/publish.go
index 0fe1d8faf..d1786e656 100644
--- a/server/go/camlistored/publish.go
+++ b/server/go/camlistored/publish.go
@@ -464,6 +464,7 @@ func (pr *publishRequest) serveSubresFileDownload() {
 func (pr *publishRequest) serveScaledImage(des *search.DescribedBlob, maxWidth, maxHeight int) {
 	fileref, _, ok := pr.fileSchemaRefFromBlob(des)
 	if !ok {
+		log.Printf("scaled image fail; failed to get file schema from des %q", des.BlobRef)
 		return
 	}
 	th := &ImageHandler{