Merge "XMP: Throw generic exceptions instead of MWException"