PR for dev_1.0

Please add a `NotFoundException` here.