diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar
index cc5e605..f9551e7 100644
Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ
diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
index 3859272..88b1e71 100644
--- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
+++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
@@ -3219,7 +3219,10 @@ public class GenericFunctions {
 	public static void updateSetItemsInInventory(Inventory inv) {
 		TwosideKeeper.log("Inventory is size "+inv.getSize(),5);
 		for (int i=0;i<inv.getSize();i++) {
-			UpdateItemLore(inv.getItem(i));
+			if (inv.getItem(i)!=null) {
+				TwosideKeeper.log("Checking "+inv.getItem(i).toString(), 4);
+				UpdateItemLore(inv.getItem(i));
+			}
 		}
 	}
 	
diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
index 624eb28..001654a 100644
--- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
+++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
@@ -3154,7 +3154,10 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
     public void onInventoryOpen(InventoryOpenEvent ev) {
     	PlayerStructure pd = (PlayerStructure)playerdata.get(ev.getPlayer().getUniqueId());
     	pd.isViewingInventory=true;
-    	GenericFunctions.updateSetItemsInInventory(ev.getInventory());
+    	//GenericFunctions.updateSetItemsInInventory(ev.getInventory());
+    	log("Fired Event.",5);
+    	GenericFunctions.updateSetItemsInInventory(ev.getView().getBottomInventory());
+    	GenericFunctions.updateSetItemsInInventory(ev.getView().getTopInventory());
     }
     
     @EventHandler(priority=EventPriority.LOW,ignoreCancelled = true)