1 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
index c021f93260..5cc249e700 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
@@ -261,11 +261,13 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
     }
 
 
-    @Override
+    @Override//Had a crash bug with breaking a rack and then the multi
     public void onRemoval() {
         super.onRemoval();
-        for (GT_MetaTileEntity_Hatch_Rack r : eRacks) {
-            r.getBaseMetaTileEntity().setActive(false);
+        for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) {
+            if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) {
+                rack.getBaseMetaTileEntity().setActive(false);
+            }
         }
     }
 
@@ -273,8 +275,10 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
     public void stopMachine() {
         super.stopMachine();
         eAvailableData=0;
-        for (GT_MetaTileEntity_Hatch_Rack r : eRacks) {
-            r.getBaseMetaTileEntity().setActive(false);
+        for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) {
+            if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) {
+                rack.getBaseMetaTileEntity().setActive(false);
+            }
         }
     }