hot fix error handling