OOIION-1760 Fixes service-client None issue with discovery