Fix/3.m/npe clientproxy