1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java b/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java
index cb3d277222..fe9d897d71 100644
--- a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java
+++ b/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java
@@ -235,9 +235,14 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
      */
     public void setComponentAlignment(Component childComponent,
             int horizontalAlignment, int verticalAlignment) {
-        componentToAlignment.put(childComponent, new Integer(
-                horizontalAlignment + verticalAlignment));
-        requestRepaint();
+        if (components.contains(childComponent)) {
+            componentToAlignment.put(childComponent, new Integer(
+                    horizontalAlignment + verticalAlignment));
+            requestRepaint();
+        } else {
+            throw new IllegalArgumentException(
+                    "Component must be added to layout before using setComponentAlignment()");
+        }
     }
 
     /*