Simplify exception handling in service