PR for dev_1.0

There are a couple of exceptions with this pattern `_____NotFoundException`.
Maybe all of them can just be under this exception class.