diff --git a/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java b/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java
index f309497..c439094 100644
--- a/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java
+++ b/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java
@@ -441,15 +441,17 @@
                     //Empty list of ports
                     List<PortDescription> ports = new ArrayList<>();
 
-                    if (driver.hasBehaviour(DeviceDescriptionDiscovery.class)) {
-                        DeviceDescriptionDiscovery deviceDiscovery = driver
-                                .createBehaviour(driverData, DeviceDescriptionDiscovery.class);
-
+                    DeviceDescriptionDiscovery deviceDiscovery = getBehaviour(driver,
+                            DeviceDescriptionDiscovery.class, driverData);
+                    if (deviceDiscovery != null) {
                         DeviceDescription newdescription = deviceDiscovery.discoverDeviceDetails();
                         if (newdescription != null) {
                             description = newdescription;
                         }
                         ports = deviceDiscovery.discoverPortDetails();
+                    } else {
+                        log.info("No Device Description Discovery for device {}, no update for " +
+                                "description or ports.", deviceId);
                     }
 
                     if (!handlePipeconf(deviceId, driver, driverData, true)) {