diff --git a/src/buffer.c b/src/buffer.c
index c9a91ce..4049f71 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4220,7 +4220,7 @@
 
     /* Use the name from the associated buffer if it exists. */
     bp = buflist_findnr(aep->ae_fnum);
-    if (bp == NULL)
+    if (bp == NULL || bp->b_fname == NULL)
 	return aep->ae_fname;
     return bp->b_fname;
 }