Add NotFoundError.
Merge remote-tracking branch 'origin/feature/testing' into feature/testing