diff --git a/core/HalfLife2.cpp b/core/HalfLife2.cpp
index b31bb392..52755131 100644
--- a/core/HalfLife2.cpp
+++ b/core/HalfLife2.cpp
@@ -993,6 +993,11 @@ cell_t CHalfLife2::EntityToBCompatRef(CBaseEntity *pEntity)
 	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));