diff --git a/src/main/java/appeng/core/features/DamagedItemDefinition.java b/src/main/java/appeng/core/features/DamagedItemDefinition.java
index 07c07b22c..a61cdd42c 100644
--- a/src/main/java/appeng/core/features/DamagedItemDefinition.java
+++ b/src/main/java/appeng/core/features/DamagedItemDefinition.java
@@ -79,7 +79,7 @@ public final class DamagedItemDefinition implements IItemDefinition
 	@Override
 	public boolean isSameAs( final ItemStack comparableStack )
 	{
-		if( comparableStack == null )
+		if( comparableStack.isEmpty() )
 		{
 			return false;
 		}
diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java
index fdda5db18..301490341 100644
--- a/src/main/java/appeng/tile/misc/TileInscriber.java
+++ b/src/main/java/appeng/tile/misc/TileInscriber.java
@@ -182,7 +182,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
 
 		for( int num = 0; num < this.inv.getSizeInventory(); num++ )
 		{
-			if( this.inv.getStackInSlot( num ) != null )
+			if( !this.inv.getStackInSlot( num ).isEmpty() )
 			{
 				slot |= ( 1 << num );
 			}