1 files changed, 3 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java b/server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java
index d80119bea1..0c6cf55bed 100644
--- a/server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java
+++ b/server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java
@@ -64,7 +64,8 @@ public class DesignToStringConverter<TYPE> implements Converter<String, TYPE> {
      *            must be public and static method that returns an object of
      *            passed type.
      */
-    public DesignToStringConverter(Class<? extends TYPE> type, String staticMethodName) {
+    public DesignToStringConverter(Class<? extends TYPE> type,
+            String staticMethodName) {
         this.type = type;
         this.staticMethodName = staticMethodName;
     }
@@ -81,7 +82,7 @@ public class DesignToStringConverter<TYPE> implements Converter<String, TYPE> {
         } catch (IllegalArgumentException e) {
             throw new Converter.ConversionException(e);
         } catch (InvocationTargetException e) {
-            throw new Converter.ConversionException(e);
+            throw new Converter.ConversionException(e.getCause());
         } catch (NoSuchMethodException e) {
             throw new Converter.ConversionException(e);
         } catch (SecurityException e) {