Call the new die_on_unsafe_path() function in a couple spots.