diff --git a/MekHQ/src/mekhq/campaign/parts/MissingCubicle.java b/MekHQ/src/mekhq/campaign/parts/MissingCubicle.java
index 3ea1906f89..7bfb65da6a 100644
--- a/MekHQ/src/mekhq/campaign/parts/MissingCubicle.java
+++ b/MekHQ/src/mekhq/campaign/parts/MissingCubicle.java
@@ -92,10 +92,11 @@ public void fix() {
             unit.addPart(actualReplacement);
             campaign.getQuartermaster().addPart(actualReplacement, 0);
             replacement.decrementQuantity();
+            Part parentReference = parentPart;
             remove(false);
-            if (null != parentPart) {
-                parentPart.addChildPart(actualReplacement);
-                parentPart.updateConditionFromPart();
+            if (null != parentReference) {
+                parentReference.addChildPart(actualReplacement);
+                parentReference.updateConditionFromPart();
             }
         }
     }