Cleaner exception catching