diff --git a/src/main/java/org/opencord/igmpproxy/IgmpManager.java b/src/main/java/org/opencord/igmpproxy/IgmpManager.java
index 36be625..d57c42e 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpManager.java
+++ b/src/main/java/org/opencord/igmpproxy/IgmpManager.java
@@ -571,9 +571,15 @@
     }
 
     private boolean isConnectPoint(DeviceId device, PortNumber port) {
-        return (connectPointMode && connectPoint.deviceId().equals(device)
-                && connectPoint.port().equals(port));
+        if (connectPoint != null) {
+            return (connectPointMode && connectPoint.deviceId().equals(device)
+                    && connectPoint.port().equals(port));
+        } else {
+            log.info("connectPoint not configured for device {}", device);
+            return false;
+        }
     }
+
     private boolean isUplink(DeviceId device, PortNumber port) {
         return ((!connectPointMode) && oltData.containsKey(device)
                 && oltData.get(device).uplink().equals(port));