--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/RiverMapfileGenerator.java	Mon Mar 04 17:08:14 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/RiverMapfileGenerator.java	Mon Mar 04 17:11:31 2013 +0100
@@ -66,11 +66,24 @@
             // We expect that every river has only one RiverAxis.
             // This is not correct but currently the case here, see
             // RiverAxis.java.
-            List<RiverAxis> riverAxis = RiverAxis.getRiverAxis(river.getName());
+            List<RiverAxis> riverAxis = null;
+            try {
+                riverAxis = RiverAxis.getRiverAxis(river.getName());
+            }
+            catch (RuntimeException he) {
+                logger.error("No valid riveraxis found for " + river.getName());
+                continue;
+            }
+
             if (riverAxis == null) {
                 logger.warn("River " + river.getName() + " has no river axis!");
                 continue;
             }
+            if (riverAxis.get(0).getGeom() == null) {
+                logger.warn("River " + river.getName() +
+                    " has no riveraxis geometry!");
+                continue;
+            }
             MultiLineString geom = riverAxis.get(0).getGeom();
             Envelope extent = geom.getEnvelopeInternal();