1 files changed, 5 insertions, 3 deletions
diff --git a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppPollOperDataImpl.java b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppPollOperDataImpl.java
index 64223aaad..e5cb13f81 100644
--- a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppPollOperDataImpl.java
+++ b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppPollOperDataImpl.java
@@ -96,9 +96,11 @@ public class VppPollOperDataImpl implements V3poService {
                             bd.arpTerm, bd.forward, bd.learn);
 
             for (vppBridgeDomainInterfaceDetails bdIf : bd.interfaces) {
-                bdBuilder.addInterface(bdIf.interfaceName,
-                        bd.bviInterfaceName == bdIf.interfaceName,
-                        bdIf.splitHorizonGroup);
+                if (bdIf.interfaceName != null) {
+                    bdBuilder.addInterface(bdIf.interfaceName,
+                            bdIf.interfaceName.equals(bd.bviInterfaceName),
+                            bdIf.splitHorizonGroup);
+                }
             }
 
             vppL2Fib[] bdFibs = l2fibByBdId.get(bdId);