diff --git a/src/version.c b/src/version.c
index 6940c82..5e44f9a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    53,
+/**/
     52,
 /**/
     51,
diff --git a/src/workshop.c b/src/workshop.c
index 66a60d3..ef25b5a 100644
--- a/src/workshop.c
+++ b/src/workshop.c
@@ -1121,8 +1121,12 @@
 				      ? (char *)curbuf->b_sfname : "<None>");
 #endif
 
-    strcpy(ffname, (char *) curbuf->b_ffname);
-    *filename = ffname;		/* copy so nobody can change b_ffname */
+    if (curbuf->b_ffname == NULL)
+	ffname[0] = NUL;
+    else
+	/* copy so nobody can change b_ffname */
+	strcpy(ffname, (char *) curbuf->b_ffname);
+    *filename = ffname;
     *curLine = curwin->w_cursor.lnum;
     *curCol = curwin->w_cursor.col;