Refactored exception handling in MSC.