More graceful handling of empty partitions.