Improve work with exception
Merge branch 'release/ExceptionImprove'