Removed convenience exception NotFoundException, fixed namespace errors.