exceptions refactoring
Merge branch 'exceptions-refactoring'