diff --git a/filehandlers/imgs/handler.go b/filehandlers/imgs/handler.go
index e18dae5a..d8ee6819 100644
--- a/filehandlers/imgs/handler.go
+++ b/filehandlers/imgs/handler.go
@@ -62,8 +62,8 @@ func (h *UploadImgHandler) removePost(data *PostMetaData) error {
 		return nil
 	}
 
-	err := h.DBPool.RemovePosts([]string{data.Post.ID})
-	h.Cfg.Logger.Infof("(%s) is empty, removing record", data.Filename)
+	h.Cfg.Logger.Infof("(%s) is empty, removing record (%s)", data.Filename, data.Cur.ID)
+	err := h.DBPool.RemovePosts([]string{data.Cur.ID})
 	if err != nil {
 		h.Cfg.Logger.Errorf("error for %s: %v", data.Filename, err)
 		return fmt.Errorf("error for %s: %v", data.Filename, err)
diff --git a/imgs/api.go b/imgs/api.go
index 43b35e81..ac86c360 100644
--- a/imgs/api.go
+++ b/imgs/api.go
@@ -255,8 +255,9 @@ func imgHandler(w http.ResponseWriter, h *ImgHandler) {
 
 	post, err := h.Dbpool.FindPostWithSlug(h.Slug, user.ID, h.Cfg.Space)
 	if err != nil {
-		h.Logger.Infof("image not found %s/%s", h.Username, h.Slug)
-		http.Error(w, err.Error(), http.StatusInternalServerError)
+		errMsg := fmt.Sprintf("image not found %s/%s", h.Username, h.Slug)
+		h.Logger.Infof(errMsg)
+		http.Error(w, errMsg, http.StatusNotFound)
 		return
 	}
 
diff --git a/imgs/html/post.page.tmpl b/imgs/html/post.page.tmpl
index 62345c9a..fe071ff6 100644
--- a/imgs/html/post.page.tmpl
+++ b/imgs/html/post.page.tmpl
@@ -49,6 +49,7 @@
 
         <div class="md">{{.Contents}}</div>
 
+        {{if .ImgURL}}
         <dl>
             <dt>Hotlink</dt>
             <dd><a href="{{.ImgURL}}">{{.ImgURL}}</a></dd>
@@ -62,6 +63,7 @@
             <dt>Resize width and height</dt>
             <dd><a href="{{.ImgURL}}/300x300">{{.ImgURL}}/300x300</a></dd>
         </dl>
+        {{end}}
     </article>
 </main>
 {{template "footer" .}}