diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
index 1e54ee8d3..57bcbd09a 100644
--- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
@@ -325,7 +325,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 
 	private boolean itemStackMatchesSearchTerm( final ItemStack itemStack, final String searchTerm )
 	{
-		if( itemStack == null )
+		if( itemStack.isEmpty() )
 		{
 			return false;
 		}
@@ -345,7 +345,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		{
 
 			final ItemStack parsedItemStack = new ItemStack( outTag.getCompoundTagAt( i ) );
-			if( parsedItemStack != null )
+			if( !parsedItemStack.isEmpty() )
 			{
 				final String displayName = Platform.getItemDisplayName( AEApi.instance().storage().createItemStack( parsedItemStack ) ).toLowerCase();
 				if( displayName.contains( searchTerm ) )
diff --git a/src/main/java/appeng/client/me/SlotDisconnected.java b/src/main/java/appeng/client/me/SlotDisconnected.java
index 4730ecd3a..fdc283d45 100644
--- a/src/main/java/appeng/client/me/SlotDisconnected.java
+++ b/src/main/java/appeng/client/me/SlotDisconnected.java
@@ -79,7 +79,7 @@ public class SlotDisconnected extends AppEngSlot
 	@Override
 	public boolean getHasStack()
 	{
-		return this.getStack() != null;
+		return !this.getStack().isEmpty();
 	}
 
 	@Override