diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 704c7ab..a4f60c4 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3013,6 +3013,8 @@
 	/* Found BOM; setup conversion, skip over BOM and recode the line. */
 	convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc);
 	p = string_convert(&cookie.conv, firstline + 3, NULL);
+	if (p == NULL)
+	    p = vim_strsave(firstline + 3);
 	if (p != NULL)
 	{
 	    vim_free(firstline);
diff --git a/src/version.c b/src/version.c
index fc8f515..858df4c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    102,
+/**/
     101,
 /**/
     100,