From 5e68258c8b6dc8d02722bd2b850c74fde338d7f9 Mon Sep 17 00:00:00 2001
From: John Alhroos <john.ahlroos@itmill.com>
Date: Fri, 30 Sep 2011 08:32:27 +0000
Subject: [PATCH] Fixed GWT exception about trying to remove a missing child
 #3725

svn changeset:21464/svn branch:6.7
---
 src/com/vaadin/terminal/gwt/client/ui/VForm.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VForm.java b/src/com/vaadin/terminal/gwt/client/ui/VForm.java
index 2b14e62f37..7debc5fe9b 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VForm.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VForm.java
@@ -127,10 +127,14 @@ public class VForm extends ComplexPanel implements Container, KeyDownHandler {
 
         if (uidl.hasAttribute("description")) {
             desc.setInnerHTML(uidl.getStringAttribute("description"));
-            fieldSet.insertFirst(desc);
+            if (desc.getParentElement() == null) {
+                fieldSet.insertFirst(desc);
+            }
         } else {
-            fieldSet.removeChild(desc);
             desc.setInnerHTML("");
+            if (desc.getParentElement() != null) {
+                fieldSet.removeChild(desc);
+            }
         }
 
         updateSize();
-- 
2.39.5