Index: /source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- /source/ariba/overlay/BaseOverlay.cpp	(revision 6930)
+++ /source/ariba/overlay/BaseOverlay.cpp	(revision 6938)
@@ -1143,8 +1143,12 @@
 	BOOST_FOREACH(const LinkDescriptor* ld, links){
 		if(ld->remoteNode != node) continue;
+		if(!ld->communicationUp) continue;
 		const EndpointDescriptor& ep =
 				bc->getEndpointDescriptor(ld->communicationId);
 		if(ep.toString() == "") continue;
-		if(ep != EndpointDescriptor::UNSPECIFIED()) return ep;
+		if(ep != EndpointDescriptor::UNSPECIFIED()) {
+			logging_info("getEndpointDescriptor: using " << ld->to_string());
+			return ep;
+		}
 	}