diff --git a/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java b/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java
index 5c6a08b..b7a9f2b 100644
--- a/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java
+++ b/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java
@@ -153,8 +153,8 @@
     // Creates an instance of behaviour primed with the specified driver data.
     private <T extends Behaviour> T createBehaviour(DriverData data, DriverHandler handler,
                                                     Class<T> behaviourClass) {
-        checkArgument(handler != null || !HandlerBehaviour.class.isAssignableFrom(behaviourClass),
-                      "{} is applicable only to handler context", behaviourClass.getName());
+        //checkArgument(handler != null || !HandlerBehaviour.class.isAssignableFrom(behaviourClass),
+        //              "{} is applicable only to handler context", behaviourClass.getName());
 
         // Locate the implementation of the requested behaviour.
         Class<? extends Behaviour> implementation = behaviours.get(behaviourClass);