--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java	Fri Feb 03 13:06:23 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java	Fri Feb 03 13:33:58 2012 +0000
@@ -798,6 +798,8 @@
         if (rowIndex < 0) {
             rowIndex = -rowIndex -1;
         }
+
+        // TODO Beyond definition, we could stop more clever.
         if (rowIndex >= rows.size()) {
             rowIndex = rows.size() -1;
         }
@@ -821,10 +823,12 @@
                     break;
                 }
             }
-            for (int after = rowIndex, R = rows.size(); after < R; after++) {
-                if (!Double.isNaN(rows.get(after).ws[col])) {
-                    rowAfter = rows.get(after);
-                    break;
+            if (rowBefore != null) {
+                for (int after = rowIndex, R = rows.size(); after < R; after++) {
+                    if (!Double.isNaN(rows.get(after).ws[col])) {
+                        rowAfter = rows.get(after);
+                        break;
+                    }
                 }
             }
 
@@ -915,7 +919,7 @@
             return new double[2][0];
         }
 
-        SplineFunction sf2 = createSpline(km1, errors);
+        SplineFunction sf2 = createSpline(km2, errors);
         if (sf2 == null) {
             return new double[2][0];
         }