diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorLabelProvider.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorLabelProvider.java
index f0035e67f69927b226fd36aa1149b238adb7d665..70939d8d9683f94072bb2eb14d21304d00c53af3 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorLabelProvider.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorLabelProvider.java
@@ -71,7 +71,7 @@ class DatabaseNavigatorLabelProvider extends ColumnLabelProvider implements IFon
     @Override
     public String getText(Object obj)
     {
-        String text;
+        String text = null;
         if (obj instanceof ILabelProvider) {
             text = ((ILabelProvider)obj).getText(obj);
 /*
@@ -80,7 +80,7 @@ class DatabaseNavigatorLabelProvider extends ColumnLabelProvider implements IFon
 */
         } else if (obj instanceof DBNNode) {
             text = ((DBNNode) obj).getNodeName();
-        } else {
+        } else if (obj != null) {
             text = obj.toString();
         }
         if (text == null) {