updates to error handling