Refactor catalog index access points logic into smaller methods and add ...

...exlicit return values.