[#50154295] More adjustments for MacOS exception handling bugs