whoops, forgot to stash/cherrypick one onError handler init line.