Some exception refactoring...