--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportMorphWidth.java	Tue Sep 18 15:58:28 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportMorphWidth.java	Wed Sep 19 10:05:36 2012 +0000
@@ -1,14 +1,12 @@
 package de.intevation.flys.importer;
 
 import java.sql.SQLException;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-
+import org.hibernate.Query;
 import org.hibernate.Session;
-import org.hibernate.Query;
 import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.MorphologicalWidth;
@@ -19,54 +17,48 @@
 
     private static Logger log = Logger.getLogger(ImportMorphWidth.class);
 
-
     protected MorphologicalWidth peer;
 
     protected ImportUnit unit;
 
     protected List<ImportMorphWidthValue> values;
 
-
     public ImportMorphWidth() {
         this.values = new ArrayList<ImportMorphWidthValue>();
     }
 
-
     public void addValue(ImportMorphWidthValue value) {
         this.values.add(value);
     }
 
-
     public void setUnit(ImportUnit unit) {
         this.unit = unit;
     }
 
-
-    public void storeDependencies(River river)
-    throws SQLException, ConstraintViolationException
-    {
+    public void storeDependencies(River river) throws SQLException,
+        ConstraintViolationException {
         log.info("store dependencies");
 
         MorphologicalWidth peer = getPeer(river);
 
-        log.info("store morphological width values");
+        if (peer != null) {
+            log.info("store morphological width values");
 
-        for (ImportMorphWidthValue value: values) {
-            value.storeDependencies(peer);
+            for (ImportMorphWidthValue value : values) {
+                value.storeDependencies(peer);
+            }
         }
     }
 
-
     public MorphologicalWidth getPeer(River river) {
         log.info("get peer");
 
         if (peer == null) {
-            Session session = ImporterSession.getInstance().getDatabaseSession();
+            Session session = ImporterSession.getInstance()
+                .getDatabaseSession();
 
-            Query query = session.createQuery(
-                "from MorphologicalWidth where " +
-                "   river=:river and " +
-                "   unit=:unit");
+            Query query = session.createQuery("from MorphologicalWidth where "
+                + "   river=:river and " + "   unit=:unit");
 
             query.setParameter("river", river);
             query.setParameter("unit", unit.getPeer());