--- a/pkg/controllers/bottlenecks.go	Wed Oct 16 16:48:20 2019 +0200
+++ b/pkg/controllers/bottlenecks.go	Wed Oct 16 16:51:09 2019 +0200
@@ -84,8 +84,9 @@
 FROM waterway.gauges_reference_water_levels grwl
   JOIN waterway.bottlenecks bns
     ON grwl.location = bns.gauge_location
-      AND grwl.validity @> current_timestamp
-WHERE bns.validity @> current_timestamp
+      AND grwl.validity @> COALESCE(upper(bns.validity), current_timestamp)
+WHERE lower(bns.validity) = (SELECT max(lower(validity))
+                             FROM waterway.bottlenecks WHERE objnam = $1)
   AND bns.objnam = $1
   AND grwl.depth_reference like 'LDC%'
 `

--- a/pkg/controllers/stretches.go	Wed Oct 16 16:48:20 2019 +0200
+++ b/pkg/controllers/stretches.go	Wed Oct 16 16:51:09 2019 +0200
@@ -100,6 +100,10 @@
 		return nil, err
 	}
 
+	if len(ldc) == 0 {
+		return nil, fmt.Errorf("No LDC found for bottleneck: %s", bn.name)
+	}
+
 	var access func(*availMeasurement) float64
 	var breaks []float64