fixed exceptions
Merge branch 'master' of https://github.com/andyspb/cpp-test