Insert more checks at the end of onEntityDeath