updated for version 7.0036
diff --git a/src/eval.c b/src/eval.c
index 3bc05c9..ec5c573 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1911,7 +1911,7 @@
 {
     forinfo    *fi = (forinfo *)fi_void;
 
-    if (fi->fi_list != NULL)
+    if (fi != NULL && fi->fi_list != NULL)
 	list_rem_watch(fi->fi_list, &fi->fi_lw);
     vim_free(fi);
 }