--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java	Mon Sep 08 18:59:10 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java	Mon Sep 08 19:00:30 2014 +0200
@@ -173,17 +173,10 @@
             String    ms_type          = (String)row[12];
 
             if (load == null || load.getId() != sl_id) {
-                if (sq_id == null) {
-                    /* Avoid NPE when converting the objects. */
-                    load = new SedimentLoadData.Load(
-                        sl_id, sl_kind, sl_description,
-                        ti_start_time, ti_stop_time);
-                } else {
-                    load = new SedimentLoadData.Load(
-                        sl_id, sl_kind, sl_description,
-                        ti_start_time, ti_stop_time, sq_id,
-                        sq_start_time, sq_stop_time);
-                }
+                load = new SedimentLoadData.Load(
+                    sl_id, sl_kind, sl_description,
+                    ti_start_time, ti_stop_time, sq_id,
+                    sq_start_time, sq_stop_time);
 
                 // Grain fractions only change when a new sediment load starts.
                 grainFractionIndex =