Tidying up the Message Management error handling