diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index fe9be26b1e78304370d770cd20a232d64adb6586..8c64bb5f142384430c2b1a53f7f849be219de6a1 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -2265,7 +2265,8 @@ public class LinkDiscoveryManager implements IOFMessageListener,
         for (Set<Link> links : switchLinks.values()) {
             for (Link link : links) {
                 LinkInfo linkInfo = this.getLinkInfo(link);
-                if (linkInfo.getLinkType() == LinkType.DIRECT_LINK) {
+                if (linkInfo != null &&
+                    linkInfo.getLinkType() == LinkType.DIRECT_LINK) {
                     numDirectLinks++;
                 }
             }