r20589: Re-add lost bad_path handling, sorry.