diff --git a/Robust.Shared/ComponentTrees/ComponentTreeSystem.cs b/Robust.Shared/ComponentTrees/ComponentTreeSystem.cs
index ded59959fe0..eaae8fab41e 100644
--- a/Robust.Shared/ComponentTrees/ComponentTreeSystem.cs
+++ b/Robust.Shared/ComponentTrees/ComponentTreeSystem.cs
@@ -242,9 +242,9 @@ public void UpdateTreePositions()
                 {
                     (pos, rot) = XformSystem.GetRelativePositionRotation(
                         entry.Transform,
-                        newTree!.Value);
+                        newTree.Value);
 
-                    newTreeComp!.Tree.Update(entry, ExtractAabb(entry, pos, rot));
+                    newTreeComp?.Tree.Update(entry, ExtractAabb(entry, pos, rot));
                     continue;
                 }
 
@@ -258,7 +258,7 @@ public void UpdateTreePositions()
 
                 (pos, rot) = XformSystem.GetRelativePositionRotation(
                     entry.Transform,
-                    newTree!.Value);
+                    newTree.Value);
 
                 newTreeComp.Tree.Add(entry, ExtractAabb(entry, pos, rot));
             }