--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WspDatacagePanel.java	Sun Oct 14 11:21:27 2012 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WspDatacagePanel.java	Sun Oct 14 14:44:28 2012 +0200
@@ -1,15 +1,17 @@
 package de.intevation.flys.client.client.ui;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
 import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.events.ClickEvent;
 
+import de.intevation.flys.client.client.Config;
+import de.intevation.flys.client.client.FLYS;
+import de.intevation.flys.client.client.FLYSConstants;
+import de.intevation.flys.client.client.event.StepForwardEvent;
+import de.intevation.flys.client.client.services.LoadArtifactService;
+import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
 import de.intevation.flys.client.shared.model.Artifact;
 import de.intevation.flys.client.shared.model.Collection;
 import de.intevation.flys.client.shared.model.Data;
@@ -22,15 +24,15 @@
 import de.intevation.flys.client.shared.model.ToLoad;
 import de.intevation.flys.client.shared.model.User;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.StepForwardEvent;
-import de.intevation.flys.client.client.services.LoadArtifactService;
-import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 
 public class WspDatacagePanel extends DatacagePanel {
 
+    private static final long serialVersionUID = 2494432743877141135L;
+
     public static final String WATERLEVEL_OUTS = "waterlevels";
 
     public static final FLYSConstants MSG = GWT.create(FLYSConstants.class);
@@ -83,14 +85,23 @@
             final  Collection c     = this.collection;
             final  Recommendation r = getSelectedRecommendation();
 
+
+            if (r == null) {
+                SC.warn(MSG.warning_no_wsp_selected());
+                return;
+            }
+
             // 2) Create, load Artifact and fire event
             loadService.load(
                 c, r, "winfo", locale,
                 new AsyncCallback<Artifact>() {
+                    @Override
                     public void onFailure(Throwable caught) {
-                        SC.warn(caught.getMessage());
+                        GWT.log("WspDatacagePanel", caught);
+                        SC.warn(FLYS.getExceptionString(MSG, caught));
                     }
 
+                    @Override
                     public void onSuccess(Artifact artifact) {
                         fireStepForwardEvent(new StepForwardEvent(
                             getData(r, artifact)));