1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/itmill/toolkit/ui/AbstractComponent.java b/src/com/itmill/toolkit/ui/AbstractComponent.java
index f4db9214ed..a4e662aa64 100644
--- a/src/com/itmill/toolkit/ui/AbstractComponent.java
+++ b/src/com/itmill/toolkit/ui/AbstractComponent.java
@@ -13,8 +13,10 @@ import java.util.Locale;
 import java.util.Map;
 
 import com.itmill.toolkit.Application;
+import com.itmill.toolkit.data.Validator.EmptyValueException;
 import com.itmill.toolkit.event.EventRouter;
 import com.itmill.toolkit.event.MethodEventSource;
+import com.itmill.toolkit.terminal.CompositeErrorMessage;
 import com.itmill.toolkit.terminal.ErrorMessage;
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
@@ -624,7 +626,12 @@ public abstract class AbstractComponent implements Component, MethodEventSource
 
                 final ErrorMessage error = getErrorMessage();
                 if (error != null) {
-                    error.paint(target);
+                    // Do not display empty value errors for
+                    // empty required fields.
+                    if (!(error instanceof EmptyValueException ||
+                          (error instanceof CompositeErrorMessage &&
+                           ((CompositeErrorMessage)error).hasErrorMessageClass(EmptyValueException.class))))
+                        error.paint(target);
                 }
             } else {
                 target.addAttribute("invisible", true);