diff --git a/src/fileio.c b/src/fileio.c
index f63bb60..bdc7439 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2981,6 +2981,13 @@
 
     if (fname == NULL || *fname == NUL)	/* safety check */
 	return FAIL;
+    if (buf->b_ml.ml_mfp == NULL)
+    {
+	/* This can happen during startup when there is a stray "w" in the
+	 * vimrc file. */
+	EMSG(_(e_emptybuf));
+	return FAIL;
+    }
 
     /*
      * Disallow writing from .exrc and .vimrc in current directory for
diff --git a/src/version.c b/src/version.c
index ed0058d..c317293 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    325,
+/**/
     324,
 /**/
     323,