1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/ui/AbstractComponent.java b/src/com/itmill/toolkit/ui/AbstractComponent.java
index 73afcb6aa8..3508266d91 100644
--- a/src/com/itmill/toolkit/ui/AbstractComponent.java
+++ b/src/com/itmill/toolkit/ui/AbstractComponent.java
@@ -450,15 +450,18 @@ public abstract class AbstractComponent implements Component, MethodEventSource
      */
     public void setParent(Component parent) {
 
-        // If the parent is not changed, dont do nothing
+        // If the parent is not changed, don't do anything
         if (parent == this.parent) {
             return;
         }
 
+        if (parent != null && this.parent != null) {
+            throw new IllegalStateException("Component already has a parent.");
+        }
+
         // Send detach event if the component have been connected to a window
         if (getApplication() != null) {
             detach();
-            this.parent = null;
         }
 
         // Connect to new parent