move to standardized error handling