Added fix to prevent ConcurrencyException during DeathEvent