Introduced configurable error handling