revert change to error_handler2