diff --git a/src/p_mobj.c b/src/p_mobj.c
index 04e02f8473bc2299a2ce34d7c9d341c08d1820b1..e8fd5fd134492e89cdc2bc2d144b64acadc8fdc4 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -10474,10 +10474,17 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 
 	if (type == MT_NULL)
 	{
+#if 0		
 #ifdef PARANOIA
 		I_Error("Tried to spawn MT_NULL\n");
 #endif
 		return NULL;
+#endif
+		// Hack: Some code assumes that P_SpawnMobj can never return NULL
+		// So replace MT_NULL with MT_RAY in the meantime
+		// Remove when dealt properly
+		CONS_Alert(CONS_WARNING, "Tried to spawn MT_NULL, using MT_RAY\n");
+		type = MT_RAY;
 	}
 
 	mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);