fixup error display in shipping, more granular logging compilation#374

Bargestt wants to merge 1 commit intoMothCocoon:5.xMothCocoon/FlowGraph:5.xfrom

Bargestt:FixOnScreenMessageInShippingBargestt/FlowGraph:FixOnScreenMessageInShippingCopy head branch name to clipboard