fix: aligns exception and diagnostics behaviour across the API surface

fix: aligns exception and diagnostics behaviour across the API surface #7365