Refactored errors in inbound message