Merge "Some cleanups to MWExceptionHandler::handleException"