Merge "Properly describe exception" into mnc-dev