Merge pull request #23471 from totten/master-exceptions