From 12468c2b3d87f61123d6429a7329d80316009fe6 Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 20 Sep 2016 11:00:44 +0300
Subject: [PATCH] Sync git svn branch with SVN repository r33219.

refs #5039
---
 .../org/simantics/browsing/ui/swt/GraphExplorerToolTip.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerToolTip.java b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerToolTip.java
index 71e9dd113..1debee624 100644
--- a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerToolTip.java
+++ b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerToolTip.java
@@ -46,7 +46,8 @@ public class GraphExplorerToolTip extends ToolTip {
             return false;
         GENodeQueryManager manager = new GENodeQueryManager(explorerContext, null, null, TreeItemReference.create(treeItem.getParentItem()));
         nodeContext = (NodeContext) treeItem.getData();
-        labeler = manager.query(nodeContext, BuiltinKeys.SELECTED_LABELER);
+        if (nodeContext != null)
+            labeler = manager.query(nodeContext, BuiltinKeys.SELECTED_LABELER);
         if (nodeContext == null || !(labeler instanceof LabelerStub))
             return false;
         return ((LabelerStub) labeler).shouldCreateToolTip(event, nodeContext);
-- 
2.47.1