Handle NotFoundException safely
Merge pull request #10 from sharoonthomas/develop

Handle NotFoundException safely