Fixes bug: 1267526
Basic error handling has been introduced. Fixes bug#1267052
Fixed naming
Merge pull request #78 from zaletniy/bug1267052

Basic error handling has been introduced. Fixes bug#1267052
Merge pull request #77 from ikhudoshyn/bug/1267526

Fixes bug: 1267526