remoting null fix