std: Rebase better errors on master