diff --git a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
index 2f617f9e0..c5948f0f5 100644
--- a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
+++ b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
@@ -60,31 +60,21 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable
 	{
 		final ItemStack currentItem = this.slot < 0 ? this.getPlayerInv().getCurrentItem() : this.getPlayerInv().getStackInSlot( this.slot );
 
-		if( this.civ != null )
-		{
-			if( currentItem != this.civ.getItemStack() )
-			{
-				if( !currentItem.isEmpty() )
-				{
-					if( ItemStack.areItemsEqual( this.civ.getItemStack(), currentItem ) )
-					{
-						this.getPlayerInv().setInventorySlotContents( this.getPlayerInv().currentItem, this.civ.getItemStack() );
-					}
-					else
-					{
-						this.setValidContainer( false );
-					}
-				}
-				else
-				{
-					this.setValidContainer( false );
-				}
-			}
-		}
-		else
+		if( this.civ == null || currentItem.isEmpty() )
 		{
 			this.setValidContainer( false );
 		}
+		else if( this.civ != null && !this.civ.getItemStack().isEmpty() && currentItem != this.civ.getItemStack() )
+		{
+			if( ItemStack.areItemsEqual( this.civ.getItemStack(), currentItem ) )
+			{
+				this.getPlayerInv().setInventorySlotContents( this.getPlayerInv().currentItem, this.civ.getItemStack() );
+			}
+			else
+			{
+				this.setValidContainer( false );
+			}
+		}
 
 		// drain 1 ae t
 		this.ticks++;