diff --git a/src/w_wad.c b/src/w_wad.c
index a2efb785d..bf1787ede 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1116,6 +1116,9 @@ lumpnum_t W_CheckNumForName(const char *name)
 {
 	INT32 i;
 	lumpnum_t check = INT16_MAX;
+	
+	if (name == NULL)
+		return LUMPERROR;
 
 	if (!*name) // some doofus gave us an empty string?
 		return LUMPERROR;
@@ -1163,6 +1166,9 @@ lumpnum_t W_CheckNumForLongName(const char *name)
 {
 	INT32 i;
 	lumpnum_t check = INT16_MAX;
+	
+	if (name == NULL)
+		return LUMPERROR;
 
 	if (!*name) // some doofus gave us an empty string?
 		return LUMPERROR;