Better error handling for empty results for customer queries