summaryrefslogtreecommitdiffstats
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-rw-r--r--client/src/com/vaadin/client/ComponentLocator.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ComponentLocator.java b/client/src/com/vaadin/client/ComponentLocator.java
index e69c55d445..47fb29777c 100644
--- a/client/src/com/vaadin/client/ComponentLocator.java
+++ b/client/src/com/vaadin/client/ComponentLocator.java
@@ -332,6 +332,11 @@ public class ComponentLocator {
} catch (Exception e) {
return null;
}
+
+ if (element == null) {
+ return null;
+ }
+
}
}