Changed behaviour of error handling
Fixed #161
Merge pull request #163 from AntonShevchuk/master

Fixed #161