diff --git a/src/memline.c b/src/memline.c
index ddaf6de..ea7d0e1 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -1329,8 +1329,11 @@
 	    mf_put(mfp, hp, FALSE, FALSE);
 	mf_close(mfp, FALSE);	    /* will also vim_free(mfp->mf_fname) */
     }
-    vim_free(buf->b_ml.ml_stack);
-    vim_free(buf);
+    if (buf != NULL)
+    {
+	vim_free(buf->b_ml.ml_stack);
+	vim_free(buf);
+    }
     if (serious_error && called_from_main)
 	ml_close(curbuf, TRUE);
 #ifdef FEAT_AUTOCMD
diff --git a/src/version.c b/src/version.c
index 09cbf73..e636520 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    179,
+/**/
     178,
 /**/
     177,