#761 - Fix possible NPE when search term is not found