Merge "Fix some MWExceptionHandler IDEA errors"