diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java index 6eca1e860d..30c9c16950 100644 --- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java +++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java @@ -669,6 +669,11 @@ public class DhcpRelayManager implements DhcpRelayService { private void deviceAdd(DeviceId deviceId) { IgnoreDhcpConfig config = cfgService.getConfig(appId, IgnoreDhcpConfig.class); + if (config == null) { + log.debug("No ignoreVlan config found for {}. Do nothing.", deviceId); + return; + } + Collection vlanIds = config.ignoredVlans().get(deviceId); vlanIds.forEach(vlanId -> { processIgnoreVlanRule(deviceId, vlanId, ADD);