diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 13ed6b0..7633d54 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4520,6 +4520,9 @@
 			pos.col = MAXCOL;
 		    else
 			pos.col = 0;
+#ifdef FEAT_VIRTUALEDIT
+		    pos.coladd = 0;
+#endif
 		    if (searchit(curwin, curbuf, &pos,
 				*cmd == '?' ? BACKWARD : FORWARD,
 				(char_u *)"", 1L, SEARCH_MSG,
diff --git a/src/option.c b/src/option.c
index 8e5021c..f3e4e20 100644
--- a/src/option.c
+++ b/src/option.c
@@ -9990,6 +9990,8 @@
     buf_T	*buf = (buf_T *)from;
 
     opt_idx = findoption(name);
+    if (opt_idx < 0)
+	return;
     p = &(options[opt_idx]);
 
     switch ((int)p->indir)
diff --git a/src/screen.c b/src/screen.c
index ba964b4..b1af862 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7801,7 +7801,7 @@
 	}
     }
     posmatch->cur = 0;
-    if (shl->lnum == lnum)
+    if (shl->lnum == lnum && bot >= 0)
     {
 	colnr_T	start = posmatch->pos[bot].col == 0
 					     ? 0 : posmatch->pos[bot].col - 1;
diff --git a/src/version.c b/src/version.c
index f8ef512..09eceab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    821,
+/**/
     820,
 /**/
     819,