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);