Fixes service-client None issue with discovery
Merge pull request #1839 from lukecampbell/disc

OOIION-1760 Fixes service-client None issue with discovery