Bug 1339: Added doublecheck for RPC registration