fix for 2830: Handle empty client entry
Merge pull request #639 from Juniper/dsetia-ml-disco2

fix for 2830: Handle empty client entry