diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index 7c628f8ea19a2bda33eb3ad136f343949b16651e..341a0940f59775b8dfc35a5fd47395ba99f4709b 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -1403,7 +1403,9 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
     	Iterator<Device> diter = deviceMap.values().iterator();
     	while (diter.hasNext()) {
             Device d = diter.next();
-            reclassifyDevice(d);
+            if (d.getEntityClass() != null && 
+            		entityClassNames.contains(d.getEntityClass().getName()))
+            	reclassifyDevice(d);
     	}
     }