CLA-778 Handle partially registered services