Merge pull request #20293 from endjkv:fix-mem-leak-when-throw