diff --git a/src/main/java/net/citizensnpcs/api/trait/trait/Equipment.java b/src/main/java/net/citizensnpcs/api/trait/trait/Equipment.java
index 8b69ae75..6685f840 100644
--- a/src/main/java/net/citizensnpcs/api/trait/trait/Equipment.java
+++ b/src/main/java/net/citizensnpcs/api/trait/trait/Equipment.java
@@ -87,7 +87,7 @@ public Map<EquipmentSlot, ItemStack> getEquipmentBySlot() {
     private EntityEquipment getEquipmentFromEntity(Entity entity) {
         if (entity instanceof LivingEntity)
             return ((LivingEntity) entity).getEquipment();
-        throw new RuntimeException("Unsupported entity equipment");
+        throw new IllegalStateException("Unsupported entity equipment");
     }
 
     @Override
diff --git a/src/main/java/net/citizensnpcs/api/trait/trait/Inventory.java b/src/main/java/net/citizensnpcs/api/trait/trait/Inventory.java
index 7fa98bb8..aac287e1 100644
--- a/src/main/java/net/citizensnpcs/api/trait/trait/Inventory.java
+++ b/src/main/java/net/citizensnpcs/api/trait/trait/Inventory.java
@@ -109,7 +109,7 @@ public void inventoryCloseEvent(InventoryCloseEvent event) {
                     if (!viewers.contains(event.getView()))
                         return;
                     ItemStack[] contents = event.getInventory().getContents();
-                    for (int i = 0; i < contents.length; i++) {
+                    for (int i = 0; i < Inventory.this.contents.length; i++) {
                         Inventory.this.contents[i] = contents[i];
                         if (i == 0) {
                             if (npc.getEntity() instanceof LivingEntity) {
@@ -134,9 +134,9 @@ public void inventoryCloseEvent(InventoryCloseEvent event) {
             }, CitizensAPI.getPlugin());
         }
         for (int i = 0; i < view.getSize(); i++) {
-            if (i >= contents.length) {
+            if (i >= contents.length)
                 break;
-            }
+
             view.setItem(i, contents[i]);
         }
         viewers.add(sender.openInventory(view));