diff --git a/patches/server/Rewrite-dataconverter-system.patch b/patches/server/Rewrite-dataconverter-system.patch
index 40537a87c5..126387eec9 100644
--- a/patches/server/Rewrite-dataconverter-system.patch
+++ b/patches/server/Rewrite-dataconverter-system.patch
@@ -22161,12 +22161,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +                if (this.clearArmor) {
 +                    final ListType armor = data.getList("ArmorItems", ObjectType.MAP);
-+                    if (armor.size() > 2) {
++                    if (armor != null && armor.size() > 2) {
 +                        armor.setMap(2, data.getTypeUtil().createEmptyMap());
 +                    }
 +
 +                    final ListType chances = data.getList("ArmorDropChances", ObjectType.FLOAT);
-+                    if (chances.size() > 2) {
++                    if (chances != null && chances.size() > 2) {
 +                        chances.setFloat(2, 0.085F);
 +                    }
 +                }