diff --git a/src/eval.c b/src/eval.c
index 8238b6e..cc9e878 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -21371,6 +21371,7 @@
 
 /*
  * Find the hashtab used for a variable name.
+ * Return NULL if the name is not valid.
  * Set "varname" to the start of name without ':'.
  */
     static hashtab_T *
@@ -21380,6 +21381,8 @@
 {
     hashitem_T	*hi;
 
+    if (name[0] == NUL)
+	return NULL;
     if (name[1] != ':')
     {
 	/* The name must not start with a colon or #. */
diff --git a/src/version.c b/src/version.c
index 53fa03d..fc27f41 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    815,
+/**/
     814,
 /**/
     813,