exception handing changed
Merge pull request #3 from romanvintonyak/master

exceptions handing changed!