Improving fix to handle empty Lists as a valid parameter