Tweak error handling in make_osx.