Guarded the baseline search, no more failures.