Index: /source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- /source/ariba/overlay/BaseOverlay.cpp	(revision 3690)
+++ /source/ariba/overlay/BaseOverlay.cpp	(revision 3693)
@@ -454,7 +454,8 @@
 	if( state == BaseOverlayStateJoinInitiated && id == initiatorLink){
 
-		logging_info( "join has been initiated by me and the link is now up. " <<
-				"sending out join request for spovnet " <<
-				spovnetId.toString() );
+		logging_info(
+			"Join has been initiated by me and the link is now up. " <<
+			"sending out join request for SpoVNet " << spovnetId.toString()
+		);
 
 		OverlayMsg overMsg( OverlayMsg::OverlayMessageTypeJoinRequest, nodeId );
@@ -636,5 +637,7 @@
 						state == BaseOverlayStateInitiator){
 
-		logging_debug( "baseoverlay received message of type OverlayMessageTypeJoinRequest" );
+		logging_debug(
+			"baseoverlay received message of type OverlayMessageTypeJoinRequest"
+		);
 
 		JoinRequest* joinReq = overlayMsg->decapsulate<JoinRequest>();
Index: /source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- /source/ariba/overlay/modules/chord/Chord.cpp	(revision 3690)
+++ /source/ariba/overlay/modules/chord/Chord.cpp	(revision 3693)
@@ -70,5 +70,5 @@
 }
 
-// helper: sets up a link using the base overlay
+/// helper: sets up a link using the base overlay
 LinkID Chord::setup(const EndpointDescriptor& endp) {
 
@@ -78,9 +78,11 @@
 }
 
-// helper: sends a message using the "base overlay"
+/// helper: sends a message using the "base overlay"
 seqnum_t Chord::send(Message* msg, const LinkID& link) {
+	if (link.isUnspecified()) return 0;
 	return baseoverlay.sendMessage(msg, link);
 }
 
+/// sends a discovery message
 void Chord::send_discovery_to(const NodeID& destination, int ttl) {
 	logging_debug("Initiating discovery of " << destination.toString() );
@@ -192,6 +194,4 @@
 	M* m = msg.getMessage()->convert<ChordMessage> ();
 	if (m == NULL) return;
-
-	logging_debug("onMessage: type=" << (int)m->getType() );
 
 	// handle messages