diff --git a/src/usercmd.c b/src/usercmd.c
index c151261ec0..cef1d18b79 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -1240,6 +1240,8 @@ may_get_cmd_block(exarg_T *eap, char_u *p, char_u **tofree, int *flags)
 	    }
 	vim_free(line);
 	retp = *tofree = ga_concat_strings(&ga, "\n");
+	if (retp == NULL)
+	    retp = p;
 	ga_clear_strings(&ga);
 	*flags |= UC_VIM9;
     }
diff --git a/src/version.c b/src/version.c
index 4ebfc1522d..628ebadacc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    309,
 /**/
     308,
 /**/