More exception refactoring.