Catch RecordNotFound exception
Merge pull request #7 from jamal/develop

Catch RecordNotFound exception