[545066] Simplify/share exception handling
2 files changed