Use NotFoundException in more places