Merge "Bug 981: Make sure QName is not null in RPC case."