I know this is not part of this PR but remove the commentary or replace by `onError builder`.