added ErrorHandler, and removed last reference to AttributeService