diff --git a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericExecutionContext.java b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericExecutionContext.java
index 553b1ca2064b5dedad91780dd922b496cc8ddb0b..92756c6d4cf711b40d8a18b19f8e8a53181b3e36 100644
--- a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericExecutionContext.java
+++ b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericExecutionContext.java
@@ -135,11 +135,9 @@ public class GenericExecutionContext extends JDBCExecutionContext implements DBC
             entityName = defaultCatalog.getName();
         } else if (context.supportsSchemaChange()) {
             GenericSchema defaultSchema = context.getDefaultSchema();
-            entityName = defaultSchema.getName();
+            entityName = defaultSchema == null ? null : defaultSchema.getName();
         }
-        if (entityName == null) {
-            log.error("Can't determine default entity type");
-        } else {
+        if (entityName != null) {
             GenericDataSource dataSource = getDataSource();
             try (JDBCSession session = openSession(monitor, DBCExecutionPurpose.UTIL, "Set active catalog")) {
                 if (dataSource.isSelectedEntityFromAPI()) {