From 847a74958da64e107113dafeb2ed6a1d3e01d358 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Tue, 21 Jun 2022 05:23:47 +1200
Subject: [PATCH] Fix other weightless crash (#8973)

---
 Content.Server/Gravity/EntitySystems/WeightlessSystem.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
index 88da9b10c7..cf86734ad0 100644
--- a/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
+++ b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
@@ -34,9 +34,11 @@ namespace Content.Server.Gravity.EntitySystems
         public void AddAlert(AlertsComponent status)
         {
             var xform = Transform(status.Owner);
-            var alerts = _alerts.GetOrNew(xform.GridID);
-
-            alerts.Add(status);
+            if (xform.GridUid != null)
+            {
+                var alerts = _alerts.GetOrNew(xform.GridUid.Value);
+                alerts.Add(status);
+            }
 
             if (_mapManager.TryGetGrid(xform.GridUid, out var grid))
             {