Exception refactoring
Merge remote-tracking branch 'origin/exception_refactoring'