--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java	Wed Mar 06 14:14:15 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java	Fri Mar 22 11:25:54 2013 +0100
@@ -1,9 +1,5 @@
 package de.intevation.flys.artifacts.model;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import de.intevation.artifacts.Artifact;
 
 import de.intevation.flys.artifacts.access.FlowVelocityAccess;
@@ -11,7 +7,10 @@
 import de.intevation.flys.model.DischargeZone;
 import de.intevation.flys.model.FlowVelocityModel;
 import de.intevation.flys.model.FlowVelocityModelValue;
-import de.intevation.flys.model.River;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import org.apache.log4j.Logger;
 
@@ -97,21 +96,11 @@
             return Collections.<FlowVelocityModel>emptyList();
         }
 
-        River river = RiverFactory.getRiver(riverName);
-        if (river == null) {
-            logger.warn("No such river: " + riverName);
-            return Collections.<FlowVelocityModel>emptyList();
-        }
-
         List<FlowVelocityModel> models = new ArrayList<FlowVelocityModel>();
 
         for (DischargeZone zone: zones) {
-            List<FlowVelocityModel> model =
-                FlowVelocityModel.getModels(river, zone);
-
-            if (model != null) {
-                models.addAll(model);
-            }
+            List<FlowVelocityModel> model = FlowVelocityModel.getModels(zone);
+            models.addAll(model);
         }
 
         return models;