v3.7.1
client: address golangci var-naming issues
Add defer-recover block to prevent panic when cc is nil