fixed NPE at onEntityDeath