Minor refactoring of exception handling