Fix handling of fields with NULL geometries.