2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
index 34c9b7f..085cadd 100644
--- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
@@ -118,7 +118,7 @@ public class EntityEventHandler
                 if (playerInfo.hasKey("ext" + i)){
                     NBTTagCompound nbt = (NBTTagCompound)playerInfo.getTag("ext" + i);
                     ItemStack item = ItemStack.loadItemStackFromNBT(nbt);
-                    if (item != null) ((ItemBaseJewelry)item.getItem()).action(item, player);
+                    if (item != null && item.getItem() instanceof ItemBaseJewelry) ((ItemBaseJewelry)item.getItem()).action(item, player);
                 }
             if (!player.worldObj.isRemote){
                 if (playerInfo.hasKey("reselectCurses") && !playerInfo.getBoolean("reselectCurses")){
diff --git a/src/main/java/darkknight/jewelrycraft/events/EventList.java b/src/main/java/darkknight/jewelrycraft/events/EventList.java
index 4515ee1..5520b87 100644
--- a/src/main/java/darkknight/jewelrycraft/events/EventList.java
+++ b/src/main/java/darkknight/jewelrycraft/events/EventList.java
@@ -47,5 +47,6 @@ public class EventList
         EffectsList.postInit(e);
         DamageSourceList.postInit(e);
         JewelrycraftMod.proxy.postInit();
+        JewelrycraftUtil.addStuff();   
     }
 }