Merge "Tweaked the message for non-MW exceptions"