Improved the error service.