Fixed race problem that can lead to NPE on ClientProxy
Merge pull request #2460 from pveentjer/fix/3.x/npe-clientproxy

Fixed race problem that can lead to NPE on ClientProxy