Don't fail if opening tooltip for disappeared component

1 files changed, 10 insertions, 2 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ConnectorMap.java b/src/com/vaadin/terminal/gwt/client/ConnectorMap.java
index 816c4f62e3..efb50b5e00 100644
--- a/src/com/vaadin/terminal/gwt/client/ConnectorMap.java
+++ b/src/com/vaadin/terminal/gwt/client/ConnectorMap.java
@@ -208,12 +208,20 @@ public class ConnectorMap {
      */
     @Deprecated
     public TooltipInfo getTooltipInfo(ComponentConnector paintable, Object key) {
-        return getComponentDetail(paintable).getTooltipInfo(key);
+        ComponentDetail componentDetail = getComponentDetail(paintable);
+        if (componentDetail == null) {
+            return null;
+        }
+        return componentDetail.getTooltipInfo(key);
     }
 
     @Deprecated
     public TooltipInfo getWidgetTooltipInfo(Widget widget, Object key) {
-        return getTooltipInfo(getConnector(widget), key);
+        ComponentConnector connector = getConnector(widget);
+        if (connector == null) {
+            return null;
+        }
+        return getTooltipInfo(connector, key);
     }
 
     public Collection<? extends ServerConnector> getConnectors() {