diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionDialog.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionDialog.java
index eb971377cb9edf1be109a3853aa5d0aa7ed3315e..cf8e077da981e799c93fafc0abe55a5cf6a9b22d 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionDialog.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionDialog.java
@@ -50,7 +50,7 @@ public class EditConnectionDialog extends MultiPageWizardDialog
     protected Control createContents(Composite parent)
     {
         Control contents = super.createContents(parent);
-        DataSourceDescriptor activeDataSource = getWizard().getPageSettings().getActiveDataSource();
+        DataSourceDescriptor activeDataSource = getWizard().getActiveDataSource();
         getShell().setText("Connection '" + activeDataSource.getName() + "' configuration");
         getShell().setImage(DBeaverIcons.getImage(activeDataSource.getObjectImage()));
         return contents;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
index 4dd36babe6d8a874d7084c80022d04f71751469d..3ebde491fb378aee3ecee0b86fb8c642a0c9108f 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
@@ -149,7 +149,9 @@ public class EditConnectionWizard extends ConnectionWizard
     @Override
     protected void saveSettings(DataSourceDescriptor dataSource)
     {
-        pageSettings.saveSettings(dataSource);
+        if (pageSettings != null) {
+            pageSettings.saveSettings(dataSource);
+        }
         pageGeneral.saveSettings(dataSource);
         if (pageNetwork != null) {
             pageNetwork.saveConfigurations(dataSource);