Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 5668)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 5670)
@@ -125,5 +125,5 @@
 		dmsg.setTTL((uint8_t)2);
 		cmsg.encapsulate(&dmsg);
-		send(&dmsg, lnk);
+		send(&cmsg, lnk);
 	}
 	{
@@ -135,5 +135,5 @@
 		dmsg.setTTL((uint8_t)2);
 		cmsg.encapsulate(&dmsg);
-		send(&dmsg, lnk);
+		send(&cmsg, lnk);
 	}
 }
@@ -453,5 +453,5 @@
 		if (table->get_successor() != NULL) {
 			route_item* succ_item = table->get(*table->get_successor());
-			discover_neighbors(succ_item->info);
+			if (!succ_item->info.isUnspecified()) discover_neighbors(succ_item->info);
 		}
 
@@ -459,5 +459,5 @@
 		if (table->get_predesessor() != NULL) {
 			route_item* pred_item = table->get(*table->get_predesessor());
-			discover_neighbors(pred_item->info);
+			if (!succ_item->info.isUnspecified()) discover_neighbors(pred_item->info);
 		}