diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar
index 2a64d90a1..85dc5011c 100644
Binary files a/lib/CitizensAPI.jar and b/lib/CitizensAPI.jar differ
diff --git a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
index 0670e9230..936f9cf70 100644
--- a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
+++ b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
@@ -27,10 +27,10 @@ public class EquipmentEditor extends Editor {
 
     @Override
     public void begin() {
-        Messaging.send(player, "<a>Entered the equipment editor!");
-        Messaging.send(player, "<a>Right click to equip armor and items.");
-        Messaging.send(player, "<a>Right click while crouching to equip armor in the NPC's hand.");
-        Messaging.send(player, "<a>Right click with an empty hand to remove all armor and items.");
+        Messaging.send(player, "<2>Entered the equipment editor!");
+        Messaging.send(player, "<e>Right click <a>to equip armor and items.");
+        Messaging.send(player, "<e>Right click <a>while <e>crouching <a>to equip armor in the NPC's hand.");
+        Messaging.send(player, "<e>Right click <a>with an <e>empty hand <a>to remove all armor and items.");
     }
 
     @Override
@@ -100,17 +100,15 @@ public class EquipmentEditor extends Editor {
             Messaging.send(player, "<e>" + npc.getName() + " <a>had all of its items removed.");
         }
         // Now edit the equipment based on the slot
-        if (trait.get(slot) != null) {
+        if (trait.get(slot) != null && trait.get(slot).getType() != Material.AIR)
             player.getWorld().dropItemNaturally(npc.getBukkitEntity().getLocation(), trait.get(slot));
-        }
 
         ItemStack set = hand;
         if (set != null && set.getType() != Material.AIR) {
-            if (hand.getAmount() > 1) {
+            if (hand.getAmount() > 1)
                 hand.setAmount(hand.getAmount() - 1);
-            } else {
+            else
                 hand = null;
-            }
             player.setItemInHand(hand);
             set.setAmount(1);
         }