Added increased null checks in PlayerEvents