diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index 0e52c9ad..046aaa00 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -77,8 +77,8 @@ module.exports = function(){
                 that.req2params(req, this);
             },
             function(err, data){
-                if (err) throw err;
-                cartoData.getInfowindow(data, callback);
+                if (err) callback(err, null);
+                else cartoData.getInfowindow(data, callback);
             }
         );
     };