diff --git a/src/main/java/org/ultramine/server/tools/ItemBlocker.java b/src/main/java/org/ultramine/server/tools/ItemBlocker.java
index a86bb51..4c63a3a 100644
--- a/src/main/java/org/ultramine/server/tools/ItemBlocker.java
+++ b/src/main/java/org/ultramine/server/tools/ItemBlocker.java
@@ -108,7 +108,7 @@
 	}
 	
 	@SubscribeEvent
-	public void onEntityItemPickup(TickEvent.ServerTickEvent e)
+	public void onServerTick(TickEvent.ServerTickEvent e)
 	{
 		if(e.phase == TickEvent.Phase.END)
 		{
@@ -118,7 +118,7 @@
 				 {
 					 for(Slot slot :  GenericIterableFactory.newCastingIterable(player.openContainer.inventorySlots, Slot.class))
 					 {
-						if(slot.getSlotIndex() >= slot.inventory.getSizeInventory())
+						if(slot.inventory == null || slot.getSlotIndex() >= slot.inventory.getSizeInventory())
 							continue; //Fix for some broken containers
 						ItemStack is = slot.getStack();
 						BlockingSettings set = getBlockingSettings(player.dimension, is);