Exception handling enhancements