added more exception processing
Merge branch 'master' of http://github.com/loskutov/lesson3