diff --git a/core/HalfLife2.cpp b/core/HalfLife2.cpp
index 422aa7de..97551376 100644
--- a/core/HalfLife2.cpp
+++ b/core/HalfLife2.cpp
@@ -118,6 +118,10 @@ typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name)
 	{
 		for (int i=0; i<pMap->dataNumFields; i++)
 		{
+			if (pMap->dataDesc[i].fieldName == NULL)
+			{
+				continue;
+			}
 			if (strcmp(name, pMap->dataDesc[i].fieldName) == 0)
 			{
 				return &(pMap->dataDesc[i]);