Handle 404 responses with RecordNotFound error
Merge branch 'feature-record-not-found'