diff --git a/src/list.c b/src/list.c
index c624003..cf0c99f 100644
--- a/src/list.c
+++ b/src/list.c
@@ -2461,6 +2461,8 @@
 	list_T	    *l = argvars[0].vval.v_list;
 	listitem_T  *li = NULL;
 	int	    r;
+	int	    prev_locked = l->lv_lock;
+	int	    called_emsg_start = called_emsg;
 
 	CHECK_LIST_MATERIALIZE(l);
 	if (argvars[2].v_type == VAR_UNKNOWN)
@@ -2480,6 +2482,7 @@
 		li = l->lv_first;
 	}
 
+	l->lv_lock = VAR_FIXED;  // disallow the list changing here
 	copy_tv(&initial, rettv);
 	for ( ; li != NULL; li = li->li_next)
 	{
@@ -2488,9 +2491,10 @@
 	    rettv->v_type = VAR_UNKNOWN;
 	    r = call_func(func_name, -1, rettv, 2, argv, &funcexe);
 	    clear_tv(&argv[0]);
-	    if (r == FAIL)
-		return;
+	    if (r == FAIL || called_emsg != called_emsg_start)
+		break;
 	}
+	l->lv_lock = prev_locked;
     }
     else
     {