Fixed race problem potentially causing NPE in ClientProxy
Merge pull request #2474 from pveentjer/fix/3.m/npe-clientproxy

Fix/3.m/npe clientproxy