diff --git a/src/main/java/com/hbm/handler/ArmorModHandler.java b/src/main/java/com/hbm/handler/ArmorModHandler.java
index 2481dab81..9beabfb46 100644
--- a/src/main/java/com/hbm/handler/ArmorModHandler.java
+++ b/src/main/java/com/hbm/handler/ArmorModHandler.java
@@ -162,6 +162,8 @@ public class ArmorModHandler {
 			
 			if(stack != null)
 				slots[i] = stack;
+			else // Any non-existing armor mods will be sorted out automatically
+				removeMod(armor, i);
 		}
 		
 		return slots;