Return errors if lookup fails
Merge pull request #107 from jgho/errors

Return errors if lookup fails