1.1 --- a/core/HalfLife2.cpp	Mon Dec 14 23:08:15 2009 -0800
     1.2 +++ b/core/HalfLife2.cpp	Tue Dec 15 23:14:53 2009 -0800
     1.3 @@ -672,7 +672,10 @@
     1.4  	edict_t *pStoredEdict;
     1.5  	CBaseEntity *pStoredEntity;
     1.6  
     1.7 -	pStoredEdict = GetEntity(index, &pStoredEntity);
     1.8 +	if (!IndexToAThings(index, &pStoredEntity, &pStoredEdict))
     1.9 +	{
    1.10 +		return NULL;
    1.11 +	}
    1.12  
    1.13  	if (pStoredEdict == NULL || pStoredEntity == NULL)
    1.14  	{