Improved error handling for files like #1282
Improved error handling for files like #1281
Merge branch '1281-No_error_trace_after_Calculating_columns' of github.com:CartoDB/cartodb into 1281-No_error_trace_after_Calculating_columns
Merge pull request #1282 from CartoDB/1281-No_error_trace_after_Calculating_columns

Improved error handling for files like #1282