1 files changed, 2 insertions, 2 deletions

diff --git a/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java b/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
index fa90eb65..a498b3f4 100644
--- a/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
+++ b/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
@@ -51,7 +51,7 @@ public final class BasicDeviceOperator implements ConfigOperator {
      * @return DeviceDescription based on both sources
      */
     public static DeviceDescription combine(BasicDeviceConfig bdc, DeviceDescription descr) {
-        if (bdc == null) {
+        if (bdc == null || descr == null) {
             return descr;
         }
 
@@ -61,7 +61,7 @@ public final class BasicDeviceOperator implements ConfigOperator {
         }
 
         SparseAnnotations sa = combine(bdc, descr.annotations());
-        return new DefaultDeviceDescription(descr.deviceURI(), type, descr.manufacturer(),
+        return new DefaultDeviceDescription(descr.deviceUri(), type, descr.manufacturer(),
                                             descr.hwVersion(), descr.swVersion(),
                                             descr.serialNumber(), descr.chassisId(), sa);
     }