fix our error handling