--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/YearChoice.java	Tue Jun 26 20:19:31 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/YearChoice.java	Wed Jun 27 14:07:02 2018 +0200
@@ -20,21 +20,19 @@
  */
 public class YearChoice extends RadioSelect {
     private static final long serialVersionUID = 1L;
-    private InundationDurationAccess access = null;
 
     @Override
     protected LinkedHashMap<String, String> makeEntries(final CallMeta meta, final Artifact artifact) {
         // in helper-klasse; dann hier label lazy loaden
         final LinkedHashMap<String, String> entries = new LinkedHashMap<>();
-        if (artifact != null && artifact instanceof UINFOArtifact) {
-            this.access = new InundationDurationAccess((UINFOArtifact) artifact);
-        }
-        if (this.access != null) {
-            final UedauernPropertiesHelper helper = UedauernPropertiesHelper.getInstance(this.access.getRiverName());
-            final LinkedHashMap<String, String> extras = helper.getExtraLayers(meta);
-            entries.put("state.uinfo.year", null);
-            entries.putAll(extras);
-        }
+
+        final InundationDurationAccess access = new InundationDurationAccess((UINFOArtifact) artifact);
+
+        final UedauernPropertiesHelper helper = UedauernPropertiesHelper.getInstance(access.getRiverName());
+        final LinkedHashMap<String, String> extras = helper.getExtraLayers(meta);
+        entries.put("state.uinfo.year", null);
+        entries.putAll(extras);
+
         return entries;
     }