diff --git a/src/ex_getln.c b/src/ex_getln.c
index 4ff9ae1..25a12be 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -5762,7 +5762,7 @@
      */
     if (histype == HIST_SEARCH && in_map)
     {
-	if (maptick == last_maptick)
+	if (maptick == last_maptick && hisidx[HIST_SEARCH] >= 0)
 	{
 	    /* Current line is from the same mapping, remove it */
 	    hisptr = &history[HIST_SEARCH][hisidx[HIST_SEARCH]];
diff --git a/src/version.c b/src/version.c
index baba587..de3d5fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2357,
+/**/
     2356,
 /**/
     2355,