Merge "Add null check for clientInfo"