Add error handling
Merge pull request #38 from faizkhan00/731-pr

Add error handling