Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-09-18 20:33:31 -05:00
parent db50a549cf 7745263a47
commit 1f75e16cee
3 changed files with 65 additions and 10 deletions
@@ -229,7 +229,7 @@ public class MEMonitorIInventory implements IMEInventory<IAEItemStack>, IMEMonit
 		{
 			for (CachedItemStack cis : end.values())
 			{
-				if ( cis != null )
+				if ( cis != null && cis.aeStack != null )
 				{
 					IAEItemStack a = cis.aeStack.copy();
 					a.setStackSize( -a.getStackSize() );