Merge pull request #20247 from aaronlehmann/distribution-errors

Push/pull errors improvement and cleanup