diff --git a/QSB/EchoesOfTheEye/EclipseCodeControllers/WorldObjects/QSBEclipseCodeController.cs b/QSB/EchoesOfTheEye/EclipseCodeControllers/WorldObjects/QSBEclipseCodeController.cs
index 1045966d..82ca169e 100644
--- a/QSB/EchoesOfTheEye/EclipseCodeControllers/WorldObjects/QSBEclipseCodeController.cs
+++ b/QSB/EchoesOfTheEye/EclipseCodeControllers/WorldObjects/QSBEclipseCodeController.cs
@@ -24,7 +24,10 @@ public class QSBEclipseCodeController : WorldObject<EclipseCodeController4>
 
 	public override void OnRemoval()
 	{
-		UnityEngine.Object.Destroy(AttachedObject.gameObject.GetComponent<CodeControllerRemoteUpdater>());
+		if (AttachedObject)
+		{
+			UnityEngine.Object.Destroy(AttachedObject.gameObject.GetComponent<CodeControllerRemoteUpdater>());
+		}
 	}
 
 	public void SetUser(uint user)