fixed case when client id is NULL