removing bad error handling