diff --git a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
index 1fd2f0f51..90d8563ec 100644
--- a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
@@ -162,14 +162,14 @@ class Analyser extends DatabaseAnalyser {
     const uniqueNames = await this.driver.query(this.pool, this.createQuery('uniqueNames', ['tables']));
 
     let geometryColumns = { rows: [] };
-    if (views.rows.find(x => (x.pure_name = 'geometry_columns' && x.schema_name == 'public'))) {
+    if (views.rows.find(x => x.pure_name == 'geometry_columns' && x.schema_name == 'public')) {
       this.feedback({ analysingMessage: 'Loading geometry columns' });
-      geometryColumns = await this.driver.query(this.pool, this.createQuery('geometryColumns', ['tables']));
+      geometryColumns = await this.safeQuery(this.createQuery('geometryColumns', ['tables']));
     }
     let geographyColumns = { rows: [] };
-    if (views.rows.find(x => (x.pure_name = 'geography_columns' && x.schema_name == 'public'))) {
+    if (views.rows.find(x => x.pure_name == 'geography_columns' && x.schema_name == 'public')) {
       this.feedback({ analysingMessage: 'Loading geography columns' });
-      geographyColumns = await this.driver.query(this.pool, this.createQuery('geographyColumns', ['tables']));
+      geographyColumns = await this.safeQuery(this.createQuery('geographyColumns', ['tables']));
     }
 
     this.feedback({ analysingMessage: 'Finalizing DB structure' });