diff --git a/src/main/java/appeng/parts/automation/UpgradeInventory.java b/src/main/java/appeng/parts/automation/UpgradeInventory.java
index 6b61b748..152f787d 100644
--- a/src/main/java/appeng/parts/automation/UpgradeInventory.java
+++ b/src/main/java/appeng/parts/automation/UpgradeInventory.java
@@ -144,7 +144,10 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement
 	@Override
 	public void saveChanges()
 	{
-		this.parent.saveChanges();
+		if( this.parent != null )
+		{
+			this.parent.saveChanges();
+		}
 	}
 
 	@Override