fix for 2830: Handle empty client entry