Index: source/ariba/communication/BaseCommunication.cpp
===================================================================
--- source/ariba/communication/BaseCommunication.cpp	(revision 5614)
+++ source/ariba/communication/BaseCommunication.cpp	(revision 5615)
@@ -367,4 +367,5 @@
 			ld->remoteLocator = remote->clone();
 			ld->remoteEndpoint = msg->getLocalDescriptor();
+			add_endpoint(ld);
 
 			// add layer 1-3 addresses
@@ -430,4 +431,5 @@
 			);
 			ld.up = true;
+			add_endpoint(ld);
 
 			logging_debug( "Link is now up with local id "
@@ -512,5 +514,4 @@
 /// add a newly allocated link to the set of links
 void BaseCommunication::addLink( LinkDescriptor* link ) {
-	add_endpoint(link->remoteLocator);
 	linkSet.push_back( link );
 }