diff --git a/src/main/java/com/hbm/hazard/HazardSystem.java b/src/main/java/com/hbm/hazard/HazardSystem.java
index 35efa397c..3df3590a7 100644
--- a/src/main/java/com/hbm/hazard/HazardSystem.java
+++ b/src/main/java/com/hbm/hazard/HazardSystem.java
@@ -225,9 +225,13 @@ public class HazardSystem {
 
 	public static void updateDroppedItem(EntityItem entity) {
 		
-		List<HazardEntry> hazards = getHazardsFromStack(entity.getEntityItem());
+		ItemStack stack = entity.getEntityItem();
+		
+		if(entity.isDead || stack == null || stack.getItem() == null || stack.stackSize <= 0) return;
+		
+		List<HazardEntry> hazards = getHazardsFromStack(stack);
 		for(HazardEntry entry : hazards) {
-			entry.type.updateEntity(entity, HazardModifier.evalAllModifiers(entity.getEntityItem(), null, entry.baseLevel, entry.mods));
+			entry.type.updateEntity(entity, HazardModifier.evalAllModifiers(stack, null, entry.baseLevel, entry.mods));
 		}
 	}