diff --git a/src/main/java/cam72cam/immersiverailroading/model/part/SwaySimulator.java b/src/main/java/cam72cam/immersiverailroading/model/part/SwaySimulator.java
index 45dbbdb0c..6880e7b39 100644
--- a/src/main/java/cam72cam/immersiverailroading/model/part/SwaySimulator.java
+++ b/src/main/java/cam72cam/immersiverailroading/model/part/SwaySimulator.java
@@ -111,8 +111,13 @@ public double getRollDegrees() {
         }
 
         public void removed() {
-            clackFront.stop();
-            clackRear.stop();
+            // These should never be null, but for some reason they are
+            if (clackFront != null) {
+                clackFront.stop();
+            }
+            if (clackRear != null) {
+                clackRear.stop();
+            }
         }
     }