diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 509c7fa..4f741bb 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1906,6 +1906,32 @@
   delete('XclosureDir', 'rf')
 enddef
 
+def Test_invalid_function_name()
+  var lines =<< trim END
+      vim9script
+      def s: list<string>
+  END
+  CheckScriptFailure(lines, 'E129:')
+
+  lines =<< trim END
+      vim9script
+      def g: list<string>
+  END
+  CheckScriptFailure(lines, 'E129:')
+
+  lines =<< trim END
+      vim9script
+      def <SID>: list<string>
+  END
+  CheckScriptFailure(lines, 'E884:')
+
+  lines =<< trim END
+      vim9script
+      def F list<string>
+  END
+  CheckScriptFailure(lines, 'E488:')
+enddef
+
 def Test_partial_call()
   var Xsetlist = function('setloclist', [0])
   Xsetlist([], ' ', {'title': 'test'})
diff --git a/src/userfunc.c b/src/userfunc.c
index 1d96a35..39d8fb2 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2374,6 +2374,7 @@
     int		extra = 0;
     lval_T	lv;
     int		vim9script;
+    static char *e_function_name = N_("E129: Function name required");
 
     if (fdp != NULL)
 	CLEAR_POINTER(fdp);
@@ -2401,7 +2402,7 @@
     if (end == start)
     {
 	if (!skip)
-	    emsg(_("E129: Function name required"));
+	    emsg(_(e_function_name));
 	goto theend;
     }
     if (end == NULL || (lv.ll_tv != NULL && (lead > 2 || lv.ll_range)))
@@ -2517,6 +2518,12 @@
 	}
 	len = (int)(end - lv.ll_name);
     }
+    if (len <= 0)
+    {
+	if (!skip)
+	    emsg(_(e_function_name));
+	goto theend;
+    }
 
     // In Vim9 script a user function is script-local by default.
     vim9script = ASCII_ISUPPER(*start) && in_vim9script();
diff --git a/src/version.c b/src/version.c
index 984da5f..09109b0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1796,
+/**/
     1795,
 /**/
     1794,