1 files changed, 5 insertions, 0 deletions
diff --git a/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java b/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
index 1c95d4fceb..ef14549182 100644
--- a/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
+++ b/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
@@ -75,6 +75,11 @@ public class StringToDoubleConverter implements Converter<String, Double> {
             throw new ConversionException("Could not convert '" + value
                     + "' to " + getModelType().getName());
         }
+        if (parsedValue == null) {
+            // Convert "" to null
+            return null;
+        }
+
         return parsedValue.doubleValue();
     }