Handle empty search result

For me I get an empty search result instead
of a nil result. Handle that gracefully as well
Merge pull request #42 from dirkmueller/release/pebbles/master

Handle empty search result