diff --git a/src/ex_getln.c b/src/ex_getln.c
index 70acb0e..80a39cc 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -6027,8 +6027,10 @@
 	val = viminfo_readstring(virp, 1, TRUE);
 	if (val != NULL && *val != NUL)
 	{
+	    int sep = (*val == ' ' ? NUL : *val);
+
 	    if (!in_history(type, val + (type == HIST_SEARCH),
-						  viminfo_add_at_front, *val))
+						   viminfo_add_at_front, sep))
 	    {
 		/* Need to re-allocate to append the separator byte. */
 		len = STRLEN(val);
@@ -6040,7 +6042,7 @@
 			/* Search entry: Move the separator from the first
 			 * column to after the NUL. */
 			mch_memmove(p, val + 1, (size_t)len);
-			p[len] = (*val == ' ' ? NUL : *val);
+			p[len] = sep;
 		    }
 		    else
 		    {
diff --git a/src/version.c b/src/version.c
index 89ac1d0..a63b67c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    425,
+/**/
     424,
 /**/
     423,