Fix call to catalog.get during endpoint discovery

Change-Id: Ic123e1e0200ca11804570fb9921e6d18e5413411
Merge "Fix call to catalog.get during endpoint discovery"