diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index 8c3cde18679295eb048fe513cc4c291d52ffc4ba..75eaa23bc1e955410d06b4a4cddd71f009910ddb 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -357,6 +357,9 @@ IFloodlightModule, IInfoProvider, IHAListener {
                              boolean isReverse) {
 
         IOFSwitch iofSwitch = floodlightProvider.getSwitches().get(sw);
+        if (iofSwitch == null) {
+        	return;
+        }
         OFPhysicalPort ofpPort = iofSwitch.getPort(port);
 
         if (isLLDPSuppressed(sw, port)) {