diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java
index 30d3c9165587a61f0fda24e71bdd81226e7a2e71..b9a372c18a9bae2013df9b7f4a11f54fa14699fd 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java
@@ -251,6 +251,9 @@ public abstract class AbstractObjectCache<OWNER extends DBSObject, OBJECT extend
         } else {
             name = object.getName();
         }
+        if (name == null) {
+            return null;
+        }
         if (!caseSensitive) {
             return name.toUpperCase();
         }