diff --git a/Projects/UOContent/Misc/BuffIcons.cs b/Projects/UOContent/Misc/BuffIcons.cs
index a4f7a3105..fe6794d4c 100644
--- a/Projects/UOContent/Misc/BuffIcons.cs
+++ b/Projects/UOContent/Misc/BuffIcons.cs
@@ -131,26 +131,17 @@ namespace Server
 
         public static void AddBuff(Mobile m, BuffInfo b)
         {
-            if (m is PlayerMobile pm)
-            {
-                pm.AddBuff(b);
-            }
+            (m as PlayerMobile)?.AddBuff(b);
         }
 
         public static void RemoveBuff(Mobile m, BuffInfo b)
         {
-            if (m is PlayerMobile pm)
-            {
-                pm.RemoveBuff(b);
-            }
+            (m as PlayerMobile)?.RemoveBuff(b);
         }
 
         public static void RemoveBuff(Mobile m, BuffIcon b)
         {
-            if (m is PlayerMobile pm)
-            {
-                pm.RemoveBuff(b);
-            }
+            (m as PlayerMobile)?.RemoveBuff(b);
         }
     }
 
diff --git a/Projects/UOContent/Mobiles/PlayerMobile.cs b/Projects/UOContent/Mobiles/PlayerMobile.cs
index 56d5b14a5..10d45931f 100644
--- a/Projects/UOContent/Mobiles/PlayerMobile.cs
+++ b/Projects/UOContent/Mobiles/PlayerMobile.cs
@@ -4640,12 +4640,7 @@ namespace Server.Mobiles
 
         public void ResendBuffs()
         {
-            if (!BuffInfo.Enabled || m_BuffTable == null)
-            {
-                return;
-            }
-
-            if (NetState?.BuffIcon == true)
+            if (BuffInfo.Enabled && m_BuffTable != null && NetState?.BuffIcon == true)
             {
                 foreach (var info in m_BuffTable.Values)
                 {
@@ -4685,7 +4680,7 @@ namespace Server.Mobiles
 
         public void RemoveBuff(BuffIcon b)
         {
-            if (!m_BuffTable.Remove(b, out var info))
+            if (m_BuffTable == null || !m_BuffTable.Remove(b, out var info))
             {
                 return;
             }