Better empty list handling