CODE: handle missing ClientID in CPS map