diff --git a/util/Platform.java b/util/Platform.java
index 64a7c8cbb..d7837ac26 100644
--- a/util/Platform.java
+++ b/util/Platform.java
@@ -1681,7 +1681,7 @@ public class Platform
 		}
 
 		ItemStack ci = i.getContainerItem( stackInSlot.copy() );
-		if ( ci.isItemStackDamageable() && ci.getItemDamage() == ci.getMaxDamage() )
+		if ( ci != null && ci.isItemStackDamageable() && ci.getItemDamage() == ci.getMaxDamage() )
 			ci = null;
 
 		return ci;