--- a/pkg/imports/wfsjob.go	Wed Mar 11 19:29:07 2020 +0100
+++ b/pkg/imports/wfsjob.go	Wed Mar 11 23:40:44 2020 +0100
@@ -199,9 +199,6 @@
 				continue
 			}
 
-			// Optional wrapping
-			wrap := func(x interface{}) interface{} { return x }
-
 			// Look if we can deserialize given type
 			makeGeom := kindToGeometry[feature.Geometry.Type]
 			if makeGeom == nil {
@@ -209,6 +206,8 @@
 				continue
 			}
 
+			// Optional wrapping
+			wrap := func(x interface{}) interface{} { return x }
 			if feature.Geometry.Type != kind {
 				// Look if we can wrap it
 				if wrap = wrapGeomKind[[2]string{feature.Geometry.Type, kind}]; wrap == nil {
@@ -218,13 +217,11 @@
 			}
 
 			geom := makeGeom()
-
 			if err := json.Unmarshal(*feature.Geometry.Coordinates, geom); err != nil {
 				return err
 			}
 
-			err := consumer.Consume(wrap(geom), props, epsg)
-			switch {
+			switch err := consumer.Consume(wrap(geom), props, epsg); {
 			case err == ErrFeatureDuplicated:
 				dupes++
 			case err == ErrFeatureIgnored: