CDB-1305 Small code cleaning, better error output (preparing for handling complex error scenarios)
Merge branch 'privacy-maps' of https://github.com/CartoDB/cartodb into privacy-maps