Fixed Empty node list handling