Better error handling in Searcher