ConenctionContextImpl npe fix