diff --git a/src/spellfile.c b/src/spellfile.c
index fa450f3..c3e53b3 100644
--- a/src/spellfile.c
+++ b/src/spellfile.c
@@ -353,6 +353,7 @@
     int		c = 0;
     int		res;
     int		did_estack_push = FALSE;
+    ESTACK_CHECK_DECLARATION
 
     fd = mch_fopen((char *)fname, "r");
     if (fd == NULL)
@@ -393,6 +394,7 @@
 
     // Set sourcing_name, so that error messages mention the file name.
     estack_push(ETYPE_SPELL, fname, 0);
+    ESTACK_CHECK_SETUP
     did_estack_push = TRUE;
 
     /*
@@ -581,7 +583,10 @@
     if (fd != NULL)
 	fclose(fd);
     if (did_estack_push)
+    {
+	ESTACK_CHECK_NOW
 	estack_pop();
+    }
 
     return lp;
 }