[#50154295] Further reduce exceptions to address MacOS bugs