Index: source/ariba/SideportListener.cpp
===================================================================
--- source/ariba/SideportListener.cpp	(revision 6941)
+++ source/ariba/SideportListener.cpp	(revision 6944)
@@ -56,10 +56,17 @@
 
 string SideportListener::getEndpointDescription( const LinkID& link ) const {
-	if( overlay == NULL ) return "";
+	if( overlay == NULL ) {
+		std::cerr << "Sideport: No overlay found." << std::endl;
+		return "";
+	}
+	std::cerr << "WTF!!!" << std::endl;
 	return overlay->getEndpointDescriptor(link).toString();
 }
 
 string SideportListener::getEndpointDescription( const NodeID& node ) const {
-	if( overlay == NULL ) return "";
+	if( overlay == NULL ) {
+		std::cerr << "Sideport: No overlay found." << std::endl;
+		return "";
+	}
 	return overlay->getEndpointDescriptor(node).toString();
 }
Index: source/ariba/communication/BaseCommunication.cpp
===================================================================
--- source/ariba/communication/BaseCommunication.cpp	(revision 6941)
+++ source/ariba/communication/BaseCommunication.cpp	(revision 6944)
@@ -241,5 +241,5 @@
 
 const EndpointDescriptor& BaseCommunication::getEndpointDescriptor(const LinkID link) const {
-	if( link == LinkID::UNSPECIFIED){
+	if( link.isUnspecified() ){
 		return localDescriptor;
 	} else {
Index: source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- source/ariba/overlay/BaseOverlay.cpp	(revision 6941)
+++ source/ariba/overlay/BaseOverlay.cpp	(revision 6944)
@@ -1148,5 +1148,4 @@
 		const EndpointDescriptor& ep =
 				bc->getEndpointDescriptor(ld->communicationId);
-		if(ep.toString() == "") continue;
 		if(ep != EndpointDescriptor::UNSPECIFIED()) {
 			logging_info("getEndpointDescriptor: using " << ld->to_string());