1 files changed, 5 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java
index fa2b741ddd..c624663d50 100644
--- a/server/src/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/com/vaadin/server/AbstractClientConnector.java
@@ -589,6 +589,11 @@ public abstract class AbstractClientConnector implements ClientConnector,
 
     @Override
     public void removeExtension(Extension extension) {
+        if (extension.getParent() != this) {
+            throw new IllegalArgumentException(
+                    "This connector is not the parent for given extension");
+        }
+
         extension.setParent(null);
         extensions.remove(extension);
         markAsDirty();