diff --git a/src/ex_getln.c b/src/ex_getln.c
index 740cca2..9fdb377 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -6177,6 +6177,7 @@
 	}
 	vim_free(viminfo_history[type]);
 	viminfo_history[type] = NULL;
+	viminfo_hisidx[type] = 0;
     }
 }
 
@@ -6230,6 +6231,7 @@
 			&& !(round == 2 && i >= viminfo_hisidx[type]))
 		{
 		    p = round == 1 ? history[type][i].hisstr
+				   : viminfo_history[type] == NULL ? NULL
 						   : viminfo_history[type][i];
 		    if (p != NULL && (round == 2 || !history[type][i].viminfo))
 		    {
@@ -6261,7 +6263,8 @@
 		}
 	}
 	for (i = 0; i < viminfo_hisidx[type]; ++i)
-	    vim_free(viminfo_history[type][i]);
+	    if (viminfo_history[type] != NULL)
+		vim_free(viminfo_history[type][i]);
 	vim_free(viminfo_history[type]);
 	viminfo_history[type] = NULL;
 	viminfo_hisidx[type] = 0;