diff --git a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs index e403782fbf..e84b867748 100644 --- a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs @@ -274,7 +274,10 @@ namespace Content.Server.GameObjects.EntitySystems } // Try to find the stack with the material in the user's hand. - var hands = placingEnt.GetComponent(); + if(!placingEnt.TryGetComponent(out var hands)) + { + return false; + }; var activeHand = hands.GetActiveHand?.Owner; if (activeHand == null) {