diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java index c553770ab2..1de94b8c85 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java @@ -269,7 +269,7 @@ public class WebServiceNavigator implements DBWServiceNavigator { if ( contextDefaults != null && contextDefaults.supportsSchemaChange() && ( - contextDefaults.getDefaultCatalog().getName().equals(node.getName()) + contextDefaults.getDefaultCatalog() != null && contextDefaults.getDefaultCatalog().getName().equals(node.getName()) || node.getName().equals(catalog) ) ) {