--- a/pkg/imports/fd.go	Wed Apr 03 16:42:03 2019 +0200
+++ b/pkg/imports/fd.go	Wed Apr 03 17:08:18 2019 +0200
@@ -253,6 +253,8 @@
 
 		feedback.Info("Using EPSG: %d", epsg)
 
+		savepoint := Savepoint(ctx, tx, "feature")
+
 	features:
 		for _, feature := range rfc.Features {
 			if feature.Geometry.Coordinates == nil {
@@ -281,24 +283,28 @@
 				}
 				var fdid int64
 				var lat, lon float64
-				err = insertStmt.QueryRowContext(
-					ctx,
-					p.asWKB(),
-					epsg,
-					fd.LOS,
-					fd.MinWidth,
-					fd.MaxWidth,
-					fd.Depth,
-					dateInfo,
-					fd.SourceOrganization,
-				).Scan(&fdid, &lat, &lon)
+				err = savepoint(func() error {
+					err := insertStmt.QueryRowContext(
+						ctx,
+						p.asWKB(),
+						epsg,
+						fd.LOS,
+						fd.MinWidth,
+						fd.MaxWidth,
+						fd.Depth,
+						dateInfo,
+						fd.SourceOrganization,
+					).Scan(&fdid, &lat, &lon)
+					return err
+				})
 				switch {
 				case err == sql.ErrNoRows:
 					outside++
 					// ignore -> filtered by responsibility_areas
 					continue features
 				case err != nil:
-					return err
+					feedback.Warn(handleError(err).Error())
+					continue features
 				}
 				// Store for potential later removal.
 				if err = track(ctx, tx, importID, "waterway.fairway_dimensions", fdid); err != nil {