fix up error handling