Fix handling fields with null as value