Index: source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- source/ariba/overlay/BaseOverlay.cpp	(revision 5521)
+++ source/ariba/overlay/BaseOverlay.cpp	(revision 5522)
@@ -76,5 +76,8 @@
 LinkDescriptor* BaseOverlay::getAutoDescriptor( const NodeID& node, const ServiceID& service ) {
 	BOOST_FOREACH( LinkDescriptor* lp, links )
-		if (lp->autolink && lp->remoteNode == node && lp->service == service)
+		if (lp->autolink && lp->remoteNode == node && lp->service == service && lp->up)
+			return lp;
+	BOOST_FOREACH( LinkDescriptor* lp, links )
+		if (lp->autolink && lp->remoteNode == node && lp->service == service )
 			return lp;
 	return NULL;