[#50154295] Address more potential mac exception problems