LLDP fails to stop

Running vpnservice feature tests reports the following exception:

ERROR: Bundle org.opendaylight.openflowplugin.applications.topology-lldp-discovery [228] Error stopping mvn:org.opendaylight.openflowplugin.applications/topology-lldp-discovery/0.1.0-SNAPSHOT (org.osgi.framework.BundleException: Activator stop error in bundle org.opendaylight.openflowplugin.applications.topology-lldp-discovery [228].)
java.lang.Error: java.lang.NullPointerException
at org.opendaylight.openflowplugin.applications.topology.lldp.LLDPDiscoveryProvider.close(LLDPDiscoveryProvider.java:63)
at org.opendaylight.openflowplugin.applications.topology.lldp.LLDPActivator.stopImpl(LLDPActivator.java:28)
at org.opendaylight.controller.sal.binding.api.AbstractBrokerAwareActivator.stop(AbstractBrokerAwareActivator.java:75)
at org.apache.felix.framework.util.SecureAction.stopActivator(SecureAction.java:667)
at org.apache.felix.framework.Felix.stopBundle(Felix.java:2530)
at org.apache.felix.framework.Felix.setActiveStartLevel(Felix.java:1309)
at org.apache.felix.framework.FrameworkStartLevelImpl.run(FrameworkStartLevelImpl.java:304)
at java.lang.Thread.run(Thread.java:745)
Caused by: java.lang.NullPointerException
at org.opendaylight.openflowplugin.applications.topology.lldp.LLDPDiscoveryProvider.close(LLDPDiscoveryProvider.java:61)
... 7 more