diff -r 65d8f56a0006 -r 74cd59113b43 core/HalfLife2.cpp
--- a/core/HalfLife2.cpp	Sat Dec 01 13:39:34 2012 -0500
+++ b/core/HalfLife2.cpp	Sat Dec 01 13:41:00 2012 -0500
@@ -975,6 +975,11 @@
 	IServerUnknown *pUnknown = (IServerUnknown *)pEntity;
 	CBaseHandle hndl = pUnknown->GetRefEHandle();
 
+	if (hndl == INVALID_EHANDLE_INDEX)
+	{
+		return INVALID_EHANDLE_INDEX;
+	}
+	
 	if (hndl.GetEntryIndex() >= MAX_EDICTS)
 	{
 		return (hndl.ToInt() | (1<<31));