CDB-4248
Merge pull request #823 from CartoDB/CDB-4248

CDB-4248 Handle errors