diff --git a/Changes b/Changes
index ee2d4258d..de1e9d3b6 100644
--- a/Changes
+++ b/Changes
@@ -861,3 +861,4 @@
 - Fixed win32 makefile, now compiles fine.
 - Fixed (important?) reference count bug regarding sptr->serv->conf. I don't know what
   effects this caused (memory corruption?), but it didn't look good ;).
+- Fixed an invalid badword block in the conf causing a crash, reported by Monk (#2639).
diff --git a/src/s_conf.c b/src/s_conf.c
index 7f14e086d..c8fcfd629 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -5385,7 +5385,7 @@ int _test_badword(ConfigFile *conf, ConfigEntry *ce)
 		if (has_replace && action == 'b')
 		{
 			config_error("%s:%i: badword::action is block but badword::replace exists",
-				cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
 			errors++;
 		}
 	}