--- a/pkg/imports/sr.go	Thu Jun 13 11:20:17 2019 +0200
+++ b/pkg/imports/sr.go	Thu Jun 13 19:13:42 2019 +0200
@@ -32,7 +32,6 @@
 	"strings"
 	"time"
 
-	"github.com/jackc/pgx"
 	shp "github.com/jonas-p/go-shp"
 
 	"gemma.intevation.de/gemma/pkg/common"
@@ -110,12 +109,13 @@
 	insertHullSQL = `
 INSERT INTO waterway.sounding_results (
   bottleneck_id,
+  bottleneck_validity,
   date_info,
   depth_reference,
   area
 ) SELECT
-  (SELECT id FROM waterway.bottlenecks WHERE objnam = $1
-     AND validity @> CAST($2 AS timestamptz)),
+  bottleneck_id,
+  validity,
   $2::date,
   $3,
   (SELECT
@@ -124,6 +124,8 @@
     ELSE
       ST_Transform(ST_GeomFromWKB($5, $6::integer), 4326)::geography
     END)
+FROM waterway.bottlenecks
+WHERE objnam = $1 AND validity @> CAST($2 AS timestamptz)
 RETURNING
   id,
   ST_X(ST_Centroid(area::geometry)),
@@ -419,15 +421,11 @@
 	)
 	xyz, boundary = nil, nil // not need from now on.
 	feedback.Info("Calculating hull took %s.", time.Since(start))
-	if err != nil {
-		if e, isPgErr := err.(pgx.PgError); isPgErr &&
-			e.Code == notNullViolation &&
-			e.SchemaName == "waterway" &&
-			e.TableName == "sounding_results" &&
-			e.ColumnName == "bottleneck_id" {
-			return nil, fmt.Errorf(
-				"No bottleneck matching given name and time available")
-		}
+	switch {
+	case err == sql.ErrNoRows:
+		return nil, fmt.Errorf(
+			"No bottleneck matching given name and time available")
+	case err != nil:
 		return nil, err
 	}
 	feedback.Info("Best suited UTM EPSG: %d", epsg)