1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/vaadin/data/validator/AbstractValidator.java b/src/com/vaadin/data/validator/AbstractValidator.java
index 6ea2cae880..7d4f1c3a0d 100644
--- a/src/com/vaadin/data/validator/AbstractValidator.java
+++ b/src/com/vaadin/data/validator/AbstractValidator.java
@@ -43,12 +43,7 @@ public abstract class AbstractValidator implements Validator {
 
     public void validate(Object value) throws InvalidValueException {
         if (!isValid(value)) {
-            String message;
-            if (value == null) {
-                message = errorMessage.replace("{0}", "null");
-            } else {
-                message = errorMessage.replace("{0}", value.toString());
-            }
+            String message = errorMessage.replace("{0}", String.valueOf(value));
             throw new InvalidValueException(message);
         }
     }