Really check if the search is present?

This fixes the watchlist bug. Why check for defined here?
Is more a bug than a feature, that search is defined at this position in any case (we have till now), so it's safer to check for defined? and for presence?