[RJA-1902][feature] error handling
Merge pull request #880 from bugzmanov/master

[RJA-1902][feature] error handling