diff --git a/src/syntax.c b/src/syntax.c
index 6900d57..000d598 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -5654,7 +5654,7 @@
     char_u	*cpo_save;
 
     /* need at least three chars */
-    if (arg == NULL || arg[1] == NUL || arg[2] == NUL)
+    if (arg == NULL || arg[0] == NUL || arg[1] == NUL || arg[2] == NUL)
 	return NULL;
 
     end = skip_regexp(arg + 1, *arg, TRUE, NULL);
diff --git a/src/version.c b/src/version.c
index 862759c..53fa03d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    814,
+/**/
     813,
 /**/
     812,