This changes allows better error information propagation to facilitate improved ux for users encountering errors. Resolves: #10057