From 970c8d71b557ad77d59c35a8945487018a48c723 Mon Sep 17 00:00:00 2001
From: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Date: Thu, 20 Aug 2026 12:28:47 -0500
Subject: [PATCH] Fix NodeCrawling ClientSide Errors (#6429)

fix some clientside errors with nodecrawling
---
 Content.Shared/_DV/NodeCrawl/SharedNodeCrawlSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/_DV/NodeCrawl/SharedNodeCrawlSystem.cs b/Content.Shared/_DV/NodeCrawl/SharedNodeCrawlSystem.cs
index 2077d0f8a5d..ae8a741cc00 100644
--- a/Content.Shared/_DV/NodeCrawl/SharedNodeCrawlSystem.cs
+++ b/Content.Shared/_DV/NodeCrawl/SharedNodeCrawlSystem.cs
@@ -187,14 +187,14 @@ public abstract class SharedNodeCrawlSystem : EntitySystem
 
     private void OnMovementShutdown(Entity<NodeCrawlerMovementComponent> ent, ref ComponentShutdown args)
     {
-        if (ent.Comp.Node is { } node)
+        if (ent.Comp.Node is { } node && node.IsValid())
         {
             var nodeComp = Comp<CrawlableNodeComponent>(node);
             nodeComp.Crawlers.Remove(ent);
             Dirty(node, nodeComp);
         }
 
-        if (ent.Comp.HeldCrawler is { } crawler && !TerminatingOrDeleted(crawler) && TryComp<NodeCrawlerComponent>(crawler, out var nodeCrawler))
+        if (ent.Comp.HeldCrawler is { } crawler && crawler.IsValid() && !TerminatingOrDeleted(crawler) && TryComp<NodeCrawlerComponent>(crawler, out var nodeCrawler))
         {
             ExitNodeCrawl((crawler, nodeCrawler));
         }