1 files changed, 5 insertions, 3 deletions

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index b87cf213d7e..1eb7cd58c3d 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -621,9 +621,11 @@ Key bindings:
   ;; Bail out early if we have no image data.
   (if (zerop (buffer-size))
       (funcall (if (called-interactively-p 'any) 'error 'message)
-               (if (file-exists-p buffer-file-name)
-                   "Empty file"
-                 "(New file)"))
+               (if (stringp buffer-file-name)
+                   (if (file-exists-p buffer-file-name)
+                       "Empty file"
+                     "(New file)")
+                 "Empty buffer"))
     (image-mode--display)))
 
 (defun image-mode--display ()