Add conditional remoting, remove nullptr reference.