diff --git a/lib/cartodb/backends/dataview.js b/lib/cartodb/backends/dataview.js
index 25684711..1abf488c 100644
--- a/lib/cartodb/backends/dataview.js
+++ b/lib/cartodb/backends/dataview.js
@@ -1,7 +1,5 @@
-var assert = require('assert');
 var _ = require('underscore');
 var PSQL = require('cartodb-psql');
-var step = require('step');
 var BBoxFilter = require('../models/filter/bbox');
 var DataviewFactory = require('../models/dataview/factory');
 var DataviewFactoryWithOverviews = require('../models/dataview/overviews/factory');
@@ -140,39 +138,52 @@ function getOverrideParams(params, ownFilter) {
 }
 
 DataviewBackend.prototype.search = function (mapConfigProvider, user, dataviewName, params, callback) {
-    step(
-        function getMapConfig() {
-            mapConfigProvider.getMapConfig(this);
-        },
-        function runDataviewSearchQuery(err, mapConfig) {
-            assert.ifError(err);
-
-            var dataviewDefinition = getDataviewDefinition(mapConfig.obj(), dataviewName);
-            if (!dataviewDefinition) {
-                throw new Error("Dataview '" + dataviewName + "' does not exists");
-            }
-
-            var pg = new PSQL(dbParamsFromReqParams(params));
-
-            var ownFilter = +params.own_filter;
-            ownFilter = !!ownFilter;
-
-            var query = (ownFilter) ? dataviewDefinition.sql.own_filter_on : dataviewDefinition.sql.own_filter_off;
-
-            if (params.bbox) {
-                var bboxFilter = new BBoxFilter({column: 'the_geom', srid: 4326}, {bbox: params.bbox});
-                query = bboxFilter.sql(query);
-            }
-
-            var userQuery = params.q;
-
-            var dataview = DataviewFactory.getDataview(query, dataviewDefinition);
-            dataview.search(pg, userQuery, this);
-        },
-        function returnCallback(err, result) {
-            return callback(err, result);
+    mapConfigProvider.getMapConfig(function (err, mapConfig) {
+        if (err) {
+            return callback(err);
         }
-    );
+
+        var dataviewDefinition = getDataviewDefinition(mapConfig.obj(), dataviewName);
+        if (!dataviewDefinition) {
+            const error = new Error(`Dataview '${dataviewName}' does not exists`);
+            error.type = 'dataview';
+            error.http_status = 400;
+            return callback(error);
+        }
+
+        var pg;
+
+        try {
+            pg = new PSQL(dbParamsFromReqParams(params));
+        } catch (error) {
+            return callback(error);
+        }
+
+        var ownFilter = +params.own_filter;
+        ownFilter = !!ownFilter;
+
+        var query = (ownFilter) ? dataviewDefinition.sql.own_filter_on : dataviewDefinition.sql.own_filter_off;
+
+        if (params.bbox) {
+            try {
+                var bboxFilter = new BBoxFilter({ column: 'the_geom', srid: 4326 }, { bbox: params.bbox });
+                query = bboxFilter.sql(query);
+            } catch (error) {
+                return callback(error);
+            }
+        }
+
+        var userQuery = params.q;
+
+        var dataview = DataviewFactory.getDataview(query, dataviewDefinition);
+        dataview.search(pg, userQuery, function (err, result) {
+            if (err) {
+                return callback(err);
+            }
+
+            return callback(null, result);
+        });
+    });
 };
 
 function getDataviewDefinition(mapConfig, dataviewName) {