Improve error handling
Improve error handling

HydroLogic/Windshaft,HydroLogic/Windshaft,CartoDB/Windshaft,manueltimita/Windshaft,manueltimita/Windshaft,CartoDB/Windshaft,wsw0108/Windshaft,wsw0108/Windshaft,manueltimita/Windshaft,CartoDB/Windshaft,HydroLogic/Windshaft,wsw0108/Windshaft