diff --git a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
index 4abc0e8224..cb52eb7ff2 100644
--- a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
+++ b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
@@ -482,7 +482,7 @@ namespace Content.Server.GameObjects
                         if (used != null)
                         {
                             interactionSystem.Interaction(Owner, used, slot.ContainedEntity,
-                                GridCoordinates.Nullspace);
+                                GridCoordinates.InvalidGrid);
                         }
                         else
                         {
diff --git a/Content.Server/GameObjects/Components/Stack/StackComponent.cs b/Content.Server/GameObjects/Components/Stack/StackComponent.cs
index 194aa09c29..350a297064 100644
--- a/Content.Server/GameObjects/Components/Stack/StackComponent.cs
+++ b/Content.Server/GameObjects/Components/Stack/StackComponent.cs
@@ -18,7 +18,6 @@ namespace Content.Server.GameObjects.Components.Stack
     [RegisterComponent]
     public class StackComponent : Component, IAttackBy, IExamine
     {
-
 #pragma warning disable 649
         [Dependency] private readonly ISharedNotifyManager _sharedNotifyManager;
 #pragma warning restore 649
@@ -122,7 +121,7 @@ namespace Content.Server.GameObjects.Components.Stack
                 stack.Add(toTransfer);
 
                 var popupPos = eventArgs.ClickLocation;
-                if (popupPos == GridCoordinates.Nullspace)
+                if (popupPos == GridCoordinates.InvalidGrid)
                 {
                     popupPos = eventArgs.User.Transform.GridPosition;
                 }
diff --git a/RobustToolbox b/RobustToolbox
index cb563c75fd..9b5b8205b9 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit cb563c75fde05f0434b7c094c67c1f22759ca692
+Subproject commit 9b5b8205b906190092f9b62f59fad0f00858b0b7