Merge "Message prioritization error handling"