diff --git a/DeathLog/DeathLogPlugin.cs b/DeathLog/DeathLogPlugin.cs
index 6dfceda..6511ef0 100644
--- a/DeathLog/DeathLogPlugin.cs
+++ b/DeathLog/DeathLogPlugin.cs
@@ -53,7 +53,7 @@ public sealed class DeathLogPlugin : Plugin<DeathLogConfig>
         var player = e.Player;
         var attacker = e.Attacker;
         var handler = e.DamageHandler;
-        if (player.Role is RoleTypeId.None or RoleTypeId.Scp0492 || string.IsNullOrEmpty(player.ReferenceHub.nicknameSync._myNickSync))
+        if (!player.IsReady || player.Role is RoleTypeId.None or RoleTypeId.Scp0492 || string.IsNullOrEmpty(player.Nickname))
             return;
         if (attacker != null && handler is AttackerDamageHandler adh)
             LogHandler.LogAttackerDeathMessage(player, attacker, adh, Config!.VisibilityRequirement, Config.KillOnSightPermitted, Config.DefaultFontSizeScalar);
diff --git a/DeathLog/LogHandler.cs b/DeathLog/LogHandler.cs
index edd3545..317dc11 100644
--- a/DeathLog/LogHandler.cs
+++ b/DeathLog/LogHandler.cs
@@ -54,9 +54,8 @@ public static class LogHandler
     public static void LogAttackerDeathMessage(Player victim, Player attacker, AttackerDamageHandler handler, PlayerPermissions permissions, bool kosPermitted, float defaultScalar)
     {
         var isCuffed = victim.IsDisarmed;
-        var inv = victim.ReferenceHub.inventory;
-        var hasWeaponEquipped = IsWeapon(inv.CurItem.TypeId);
-        var carriesWeapon = inv.UserInventory.Items.Any(item => IsWeapon(item.Value.ItemTypeId));
+        var hasWeaponEquipped = IsWeapon(victim.Inventory.CurItem.TypeId);
+        var carriesWeapon = victim.Items.Any(item => IsWeapon(item!.Type));
         var victimRole = victim.Role;
         var footprint = handler.Attacker;
         var attackerRole = footprint.Role;
@@ -94,7 +93,7 @@ public static class LogHandler
 
     private static object GetKillerStatus(Player attacker, float sizeScalar)
     {
-        var role = attacker.Rm().CurrentRole;
+        var role = attacker.RoleBase;
         return GetIdWithDnt(attacker, sizeScalar)
                + " "
                + role.RoleName.Color(role.RoleColor.ToHex(true, false)).Size(35.Scale(sizeScalar))
@@ -103,7 +102,7 @@ public static class LogHandler
 
     private static object GetVictimStatus(Player victim, float sizeScalar)
     {
-        var role = victim.Rm().CurrentRole;
+        var role = victim.RoleBase;
         return GetIdWithDnt(victim, sizeScalar).Size(25.Scale(sizeScalar))
                + " "
                + role.RoleName.Color(role.RoleColor.ToHex(true, false)).Size(35.Scale(sizeScalar))