Fixed another NPE in DeviceDBRDHelper