null support for pseudo client
null support fixes for pseudo client