Cleaner exception handling