[#50154295] Address more MacOS exception handling issues