diff --git a/src/eval.c b/src/eval.c
index c37075b..19b4479 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -10448,7 +10448,7 @@
     {
 	do
 	{
-	    if (rettv->v_type == VAR_STRING)
+	    if (rettv->v_type == VAR_STRING || rettv->v_type == VAR_LIST)
 		vim_free(fresult);
 	    fresult = find_file_in_path_option(first ? fname : NULL,
 					       first ? (int)STRLEN(fname) : 0,
diff --git a/src/version.c b/src/version.c
index 203daed..8bebdde 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1240,
+/**/
     1239,
 /**/
     1238,