From 916b1521a0d65da59ee0f16882cc9dada2571779 Mon Sep 17 00:00:00 2001
From: moneyl <8206401+Moneyl@users.noreply.github.com>
Date: Sat, 18 May 2019 13:26:58 -0400
Subject: [PATCH] Fixes server crash when clicking empty hand with full hand

---
 .../GameObjects/Components/GUI/ServerHandsComponent.cs        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
index 3822f1d39a..d24586a3d0 100644
--- a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
+++ b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
@@ -462,8 +462,8 @@ namespace Content.Server.GameObjects
                     var playerEntity = session.AttachedEntity;
                     var used = GetActiveHand?.Owner;
 
-                    if (playerEntity == Owner && used != null)
-                    {
+                    if (playerEntity == Owner && used != null && slot.ContainedEntity != null)
+                        {
                         var interactionSystem = _entitySystemManager.GetEntitySystem<InteractionSystem>();
                         interactionSystem.Interaction(Owner, used, slot.ContainedEntity,
                             GridCoordinates.Nullspace);