More empty list handling