Fixes #2167

svn changeset:5727/svn branch:trunk

1 files changed, 9 insertions, 2 deletions

diff --git a/src/com/itmill/toolkit/ui/Form.java b/src/com/itmill/toolkit/ui/Form.java
index 8cff371841..593e59f045 100644
--- a/src/com/itmill/toolkit/ui/Form.java
+++ b/src/com/itmill/toolkit/ui/Form.java
@@ -200,11 +200,18 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
 
                     validationError = field.getErrorMessage();
                     if (validationError != null) {
-                        // Skip empty errors
+                        // Show caption as error for fields with empty errors
                         if ("".equals(validationError.toString())) {
-                            continue;
+                            validationError = new Validator.InvalidValueException(
+                                    field.getCaption());
                         }
                         break;
+                    } else if (f instanceof Field && !((Field) f).isValid()) {
+                        // Something is wring with the field, but no proper
+                        // error is given. Generate one.
+                        validationError = new Validator.InvalidValueException(
+                                field.getCaption());
+                        break;
                     }
                 }
             }