Fixed bug with service lookup

There is no need to retrieve CI by uid. We have it in the bundle. Trying to retrieve it again caused crash for CIs that had no uid.