Partial fix for #1414

This should catch like 90% of the poorly constructed ItemStacks being sent around.