diff --git a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
index d934f0fc1..d6b62f351 100644
--- a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
+++ b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
@@ -108,7 +108,8 @@ public class EquipmentEditor extends Editor {
         else
             hand = null;
         player.setItemInHand(hand);
-        set.setAmount(1);
+        if (set != null)
+            set.setAmount(1);
         trait.setEquipment(slot, set);
     }
 }
\ No newline at end of file