Fix/3.m/npe clientproxy

Resolves a data race in the client proxy that can lead to an NPE.