diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs index 576d0c6cf7..1a71bae11f 100644 --- a/Content.Server/Stack/StackSystem.cs +++ b/Content.Server/Stack/StackSystem.cs @@ -50,7 +50,10 @@ namespace Content.Server.Stack // Get a prototype ID to spawn the new entity. Null is also valid, although it should rarely be picked... var prototype = _prototypeManager.TryIndex(stack.StackTypeId, out var stackType) ? stackType.Spawn - : stack.Owner.Prototype?.ID ?? null; + : stack.Owner.Prototype?.ID; + + if (prototype == null) + return null; // Try to remove the amount of things we want to split from the original stack... if (!Use(uid, amount, stack))