diff --git a/packages/api/src/controllers/serverConnections.js b/packages/api/src/controllers/serverConnections.js
index ccdbefe1b..5417a2ce4 100644
--- a/packages/api/src/controllers/serverConnections.js
+++ b/packages/api/src/controllers/serverConnections.js
@@ -47,6 +47,9 @@ module.exports = {
       const existing = this.opened.find(x => x.conid == conid);
       if (existing) return existing;
       const connection = await connections.getCore({ conid });
+      if (!connection) {
+        throw new Error(`Connection with conid="${conid}" not fund`);
+      }
       if (connection.passwordMode == 'askPassword' || connection.passwordMode == 'askUser') {
         throw new MissingCredentialsError({ conid, passwordMode: connection.passwordMode });
       }
@@ -110,6 +113,7 @@ module.exports = {
 
   listDatabases_meta: true,
   async listDatabases({ conid }, req) {
+    if (!conid) return [];
     testConnectionPermission(conid, req);
     const opened = await this.ensureOpened(conid);
     return opened.databases;
diff --git a/packages/web/src/impexp/SourceTargetConfig.svelte b/packages/web/src/impexp/SourceTargetConfig.svelte
index 900faa1e1..a972af7e2 100644
--- a/packages/web/src/impexp/SourceTargetConfig.svelte
+++ b/packages/web/src/impexp/SourceTargetConfig.svelte
@@ -21,7 +21,7 @@
   import FormSchemaSelect from './FormSchemaSelect.svelte';
   import FormTablesSelect from './FormTablesSelect.svelte';
   import { findEngineDriver } from 'dbgate-tools';
-import AceEditor from '../query/AceEditor.svelte';
+  import AceEditor from '../query/AceEditor.svelte';
 
   export let direction;
   export let storageTypeField;
@@ -139,17 +139,9 @@ import AceEditor from '../query/AceEditor.svelte';
     <div class="label">Query</div>
     <div class="sqlwrap">
       {#if $values.sourceQueryType == 'json'}
-        <AceEditor
-          value={$values.sourceQuery}
-          on:input={e => setFieldValue('sourceQuery', e.detail)}
-          mode="json"
-        />
+        <AceEditor value={$values.sourceQuery} on:input={e => setFieldValue('sourceQuery', e.detail)} mode="json" />
       {:else}
-        <SqlEditor
-          value={$values.sourceQuery}
-          on:input={e => setFieldValue('sourceQuery', e.detail)}
-          {engine}
-        />
+        <SqlEditor value={$values.sourceQuery} on:input={e => setFieldValue('sourceQuery', e.detail)} {engine} />
       {/if}
     </div>
   {/if}