Error handling logic improved
Merge pull request #12 from olx-inc/issue-11

Error handling logic improved