Cleanup exception handling/unnecessary ThesaurusSearcher class

@anguss00  feel free to make any required changes as I won't be around for the next couple of days