Should throw ObjectNotFoundError for catalog is messing.

Change-Id: I44c9bc8513c3adaa85c0baab68f575b6d41e0105