summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/vaadin/terminal/gwt/client/VCaption.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/VCaption.java b/src/com/vaadin/terminal/gwt/client/VCaption.java
index ba57956c27..72d29071cd 100644
--- a/src/com/vaadin/terminal/gwt/client/VCaption.java
+++ b/src/com/vaadin/terminal/gwt/client/VCaption.java
@@ -52,7 +52,9 @@ public class VCaption extends HTML {
this.client = client;
owner = component;
- setOwnerPid(getElement(), client.getPid(owner));
+ if (client != null && owner != null) {
+ setOwnerPid(getElement(), client.getPid(owner));
+ }
setStyleName(CLASSNAME);
sinkEvents(VTooltip.TOOLTIP_EVENTS);