Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp
===================================================================
--- source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 7043)
+++ source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 7532)
@@ -72,6 +72,6 @@
 OverlayBootstrap* BluetoothSdp::CONNECTION_CHECKER = NULL;
 
-BluetoothSdp::BluetoothSdp(BootstrapInformationCallback* _callback) :
-	BootstrapModule(_callback), scan_timer_(io_service_) {
+BluetoothSdp::BluetoothSdp(BootstrapInformationCallback* _callback, string info)
+	: BootstrapModule(_callback), scan_timer_(io_service_) {
 	srand( time(NULL) );
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
@@ -80,5 +80,4 @@
 	// of the info strings (as an attribute)
 	channel_ = 1;
-
 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
 }
Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h
===================================================================
--- source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h	(revision 7043)
+++ source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h	(revision 7532)
@@ -80,5 +80,5 @@
 	static OverlayBootstrap* CONNECTION_CHECKER;
 
-	BluetoothSdp(BootstrapInformationCallback* _callback);
+	BluetoothSdp(BootstrapInformationCallback* _callback, string info);
 	virtual ~BluetoothSdp();
 
Index: source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp
===================================================================
--- source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp	(revision 7043)
+++ source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp	(revision 7532)
@@ -46,5 +46,6 @@
 use_logging_cpp(MulticastDns);
 
-MulticastDns::MulticastDns(BootstrapInformationCallback* _callback) : BootstrapModule(_callback) {
+MulticastDns::MulticastDns(BootstrapInformationCallback* _callback, string info)
+	: BootstrapModule(_callback) {
   #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
 	avahiclient = NULL;
Index: source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h
===================================================================
--- source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h	(revision 7043)
+++ source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h	(revision 7532)
@@ -71,5 +71,5 @@
 	use_logging_h(MulticastDns);
 public:
-	MulticastDns(BootstrapInformationCallback* _callback);
+	MulticastDns(BootstrapInformationCallback* _callback, string info);
 	virtual ~MulticastDns();
 
Index: source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp
===================================================================
--- source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp	(revision 7043)
+++ source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp	(revision 7532)
@@ -63,5 +63,5 @@
 const unsigned int PeriodicBroadcast::serverport_v6 = 5636;
 
-PeriodicBroadcast::PeriodicBroadcast(BootstrapInformationCallback* _callback)
+PeriodicBroadcast::PeriodicBroadcast(BootstrapInformationCallback* _callback, string info)
 	: BootstrapModule(_callback),
 	server(io_service, &newRemoteServices, &newRemoteServicesMutex) {
@@ -108,4 +108,6 @@
 
 	boost::mutex::scoped_lock lock( localServicesMutex );
+	if(name.empty()) return;
+
 	localServices.insert( std::make_pair(name, service) );
 }
@@ -113,4 +115,5 @@
 void PeriodicBroadcast::revokeService(string name){
 	boost::mutex::scoped_lock lock( localServicesMutex );
+	if(name.empty()) return;
 
 	ServiceList::iterator i = localServices.find( name );
Index: source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h
===================================================================
--- source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h	(revision 7043)
+++ source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h	(revision 7532)
@@ -66,5 +66,5 @@
 	use_logging_h(PeriodicBroadcast);
 public:
-	PeriodicBroadcast(BootstrapInformationCallback* _callback);
+	PeriodicBroadcast(BootstrapInformationCallback* _callback, string info);
 	virtual ~PeriodicBroadcast();
 
@@ -275,4 +275,5 @@
 
 			PeriodicBroadcastMessage msg;
+			if(service.getName().empty()) return;
 
 			msg.setName( service.getName() );
@@ -351,4 +352,5 @@
 				{ // insert new found service
 					boost::mutex::scoped_lock lock( *servicesmutex );
+					if(msg.getName().empty()) return;
 
 					ServiceList::iterator it = services->find( msg.getName() );