diff --git a/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java b/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
index e79f58e..f2cfdcd 100644
--- a/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
+++ b/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
@@ -332,6 +332,9 @@
     private Optional<Port> findSourcePortByName(String remotePortName,
                                                 DeviceService deviceService,
                                                 Device remoteDevice) {
+        if (remotePortName == null) {
+            return Optional.empty();
+        }
         Optional<Port> remotePort = deviceService.getPorts(remoteDevice.id())
                 .stream().filter(port -> Objects.equals(remotePortName,
                                                         port.annotations().value(AnnotationKeys.PORT_NAME)))