diff --git a/src/edit.c b/src/edit.c
index 19e5b8d..75b1808 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -7397,6 +7397,10 @@
     int		icase;
     int		i;
 
+    if (keytyped == NUL)
+	/* Can happen with CTRL-Y and CTRL-E on a short line. */
+	return FALSE;
+
 #ifdef FEAT_EVAL
     if (*curbuf->b_p_inde != NUL)
 	look = curbuf->b_p_indk;	/* 'indentexpr' set: use 'indentkeys' */
diff --git a/src/version.c b/src/version.c
index 2798658..9523db5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    322,
+/**/
     321,
 /**/
     320,