exception refactoring fix (?)