Error handling for latest changes
Merge pull request #15 from evmarkov/master

Error handling for latest changes