From ec0e90e8ce1b3d4347cfcd66080a8e3e35bc25a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 31 Jul 2018 13:33:33 +0200
Subject: [PATCH] Avoid uncaught exceptions

---
 lib/cartodb/backends/dataview.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/cartodb/backends/dataview.js b/lib/cartodb/backends/dataview.js
index 1c7a02f5..bf0b31bf 100644
--- a/lib/cartodb/backends/dataview.js
+++ b/lib/cartodb/backends/dataview.js
@@ -41,18 +41,18 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
             return callback(error);
         }
 
-        var pg = new PSQL(dbParamsFromReqParams(params));
-        var query = getQueryWithFilters(dataviewDefinition, params);
-        var queryRewriteData = getQueryRewriteData(mapConfig, dataviewDefinition, params);
-        var dataviewFactory = DataviewFactoryWithOverviews.getFactory(
-            overviewsQueryRewriter, queryRewriteData, { bbox: params.bbox }
-        );
-
-        var dataview = dataviewFactory.getDataview(query, dataviewDefinition);
-
-        let overrideParams;
+        var pg;
+        var overrideParams;
+        var dataview;
 
         try {
+            pg = new PSQL(dbParamsFromReqParams(params));
+            var query = getQueryWithFilters(dataviewDefinition, params);
+            var queryRewriteData = getQueryRewriteData(mapConfig, dataviewDefinition, params);
+            var dataviewFactory = DataviewFactoryWithOverviews.getFactory(overviewsQueryRewriter, queryRewriteData, {
+                bbox: params.bbox
+            });
+            dataview = dataviewFactory.getDataview(query, dataviewDefinition);
             var ownFilter = +params.own_filter;
             overrideParams = getOverrideParams(params, !!ownFilter);
         } catch (error) {