Try to handle empty results (#11)