--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java	Mon Aug 20 08:34:05 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java	Wed Aug 22 10:18:00 2012 +0000
@@ -1,20 +1,17 @@
 package de.intevation.flys.artifacts.model;
 
+import de.intevation.artifactdatabase.state.Facet;
+import de.intevation.artifacts.Artifact;
+import de.intevation.artifacts.CallContext;
+import de.intevation.artifacts.DataProvider;
+import de.intevation.flys.artifacts.HYKArtifact;
+import de.intevation.flys.artifacts.states.DefaultState.ComputeType;
+import de.intevation.flys.model.FastCrossSectionLine;
+
 import java.util.List;
 
 import org.apache.log4j.Logger;
 
-import de.intevation.artifacts.Artifact;
-import de.intevation.artifacts.CallContext;
-import de.intevation.artifacts.DataProvider;
-
-import de.intevation.artifactdatabase.state.Facet;
-
-import de.intevation.flys.artifacts.HYKArtifact;
-
-import de.intevation.flys.artifacts.states.DefaultState.ComputeType;
-import de.intevation.flys.model.FastCrossSectionLine;
-
 
 /**
  * Trival Facet for HYKs
@@ -39,7 +36,8 @@
      * @param art artifact to get data from.
      * @param context ignored
      */
-     public Object getData(Artifact art, CallContext context) {
+     @Override
+    public Object getData(Artifact art, CallContext context) {
         logger.debug("HYKFacet.getData");
 
         String dataKey = CrossSectionFacet.BLACKBOARD_CS_MASTER_DATA;
@@ -53,6 +51,11 @@
         FastCrossSectionLine crossSection = (FastCrossSectionLine) providers.get(0)
             .provideData(dataKey, null, context);
 
+        if(crossSection == null) {
+            logger.debug("getData: crossSection is null");
+            return null;
+        }
+
         double km = crossSection.getKm();
         logger.debug("HYKFacet.getData: Master Cross Section is at km: " + km);