Merge "MWException: Cleanup exception message output"