Simplify exception handling