From c9786ee3f63826e4899bda453a3f06cc8068f29c Mon Sep 17 00:00:00 2001
From: Javier Goizueta <jgoizueta@gmail.com>
Date: Wed, 3 Oct 2018 23:13:22 +0200
Subject: [PATCH] Catch aggregation query errors

---
 .../mapconfig/adapter/aggregation-mapconfig-adapter.js   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
index 9752ab57..82de77d1 100644
--- a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
@@ -95,7 +95,14 @@ module.exports = class AggregationMapConfigAdapter {
 
                 const sqlQueryWrap = layer.options.sql_wrap;
 
-                let aggregationSql = mapConfig.getAggregatedQuery(index);
+                let aggregationSql;
+
+                try {
+                    aggregationSql = mapConfig.getAggregatedQuery(index);
+                }
+                catch (error) {
+                    return reject(error);
+                }
 
                 if (sqlQueryWrap) {
                     aggregationSql = sqlQueryWrap.replace(/<%=\s*sql\s*%>/g, aggregationSql);