diff --git a/src/evalfunc.c b/src/evalfunc.c
index 825df5fbfd..c7936238e0 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5219,7 +5219,8 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref)
 	{
 	    // generic function
 	    start_bracket = name;
-	    skip_generic_func_type_args(&name);
+	    if (skip_generic_func_type_args(&name) == FAIL)
+		goto theend;
 	}
 	if (*name != NUL)
 	    s = NULL;
diff --git a/src/version.c b/src/version.c
index c016cf4ffe..b5e0da2a2c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1579,
 /**/
     1578,
 /**/