Fixed NPE in onEntityDeath