diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index 5b87d7804a..e8bc0805ca 100644
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -382,7 +382,7 @@ cmdline_pum_create(
     }
 
     // Compute the popup menu starting column
-    compl_startcol = vim_strsize(ccline->cmdbuff) + 1;
+    compl_startcol = ccline == NULL ? 0 : vim_strsize(ccline->cmdbuff) + 1;
     columns = vim_strsize(xp->xp_pattern);
     if (showtail)
     {
diff --git a/src/version.c b/src/version.c
index 1a17d2e4c7..2d36034abd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1335,
 /**/
     1334,
 /**/