No more failing when looking up empty results; Fixes #1