diff --git a/source/simulation/EntityManager.cpp b/source/simulation/EntityManager.cpp
index 32243d8053..0f33803357 100755
--- a/source/simulation/EntityManager.cpp
+++ b/source/simulation/EntityManager.cpp
@@ -19,6 +19,7 @@ CEntityManager::CEntityManager()
 {
 	m_nextalloc = 0;
 	m_extant = true;
+	m_death = false;
 
 	// Also load a couple of global entity settings
 	CConfigValue* cfg = g_ConfigDB.GetValue( CFG_USER, "selection.outline.quality" );
@@ -100,6 +101,12 @@ HEntity* CEntityManager::getByHandle( u16 index )
 	if( !m_entities[index].m_refcount ) return( NULL );
 	return( new HEntity( index ) );
 }
+CHandle *CEntityManager::getHandle( int index )
+{
+	if (!m_entities[index].m_refcount )
+		return NULL;
+	return &m_entities[index];
+}
 
 std::vector<HEntity>* CEntityManager::matches( EntityPredicate predicate, void* userdata )
 {