--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java	Mon Jun 18 12:29:29 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java	Mon Jun 18 13:29:15 2012 +0000
@@ -70,19 +70,22 @@
         FixDerivateFacet facet = (FixDerivateFacet)aaf.getFacet();
         FixFunction func = (FixFunction)facet.getData(
             aaf.getArtifact(), context);
-        
-        double maxQ = func.getMaxQ();
-        maxQ = Math.min(2000.0, Math.abs(maxQ));
-        maxQ += maxQ * 0.05;
+
+        if(func != null) {        
+            double maxQ = func.getMaxQ();
         
-        if(maxQ > 0) {
-            XYSeries series = DatasetUtilities.sampleFunction2DToSeries(
-                new Function2DAdapter(func.getFunction()),
-                0,              // start
-                maxQ, // end
-                500,            // number of samples
-                aaf.getFacetDescription());
-            addAxisSeries(series, 0, visible);
+            if(maxQ > 0) {
+                XYSeries series = DatasetUtilities.sampleFunction2DToSeries(
+                    new Function2DAdapter(func.getFunction()),
+                    0,              // start
+                    maxQ, // end
+                    500,            // number of samples
+                    aaf.getFacetDescription());
+                addAxisSeries(series, 0, visible);
+            }
+        }
+        else {
+            logger.debug("doOut: func == null");
         }
     }