added ErrorHandler as well