[#50154295] Another take at reducing macos exception problems