diff --git a/Projects/UOContent/Gumps/Props/PropsGump.cs b/Projects/UOContent/Gumps/Props/PropsGump.cs
index 5a1b327b0..f88c3880a 100644
--- a/Projects/UOContent/Gumps/Props/PropsGump.cs
+++ b/Projects/UOContent/Gumps/Props/PropsGump.cs
@@ -229,8 +229,8 @@ namespace Server.Gumps
 
                     var cpa = GetCPA(prop);
 
-                    if ((!prop.GetType().IsValueType || prop.CanWrite) && cpa != null &&
-                        m_Mobile.AccessLevel >= cpa.WriteLevel && !cpa.ReadOnly)
+                    if (!prop.GetType().IsValueType && prop.CanWrite &&
+                        m_Mobile.AccessLevel >= cpa?.WriteLevel && !cpa.ReadOnly)
                     {
                         AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, i + 3);
                     }
@@ -296,7 +296,7 @@ namespace Server.Gumps
 
                         var attr = GetCPA(prop);
 
-                        if (prop.GetType().IsValueType && !prop.CanWrite || attr == null ||
+                        if (prop.GetType().IsValueType || !prop.CanWrite || attr == null ||
                             from.AccessLevel < attr.WriteLevel || attr.ReadOnly)
                         {
                             return;