diff --git a/src/list.c b/src/list.c
index 866de18..b62c141 100644
--- a/src/list.c
+++ b/src/list.c
@@ -2185,8 +2185,13 @@
 		nli = li->li_next;
 		set_vim_var_nr(VV_KEY, idx);
 		if (filter_map_one(&li->li_tv, expr, filtermap,
-					     &newtv, &rem) == FAIL || did_emsg)
+							 &newtv, &rem) == FAIL)
 		    break;
+		if (did_emsg)
+		{
+		    clear_tv(&newtv);
+		    break;
+		}
 		if (filtermap == FILTERMAP_MAP)
 		{
 		    // map(): replace the list item value