Index: source/ariba/SideportListener.cpp
===================================================================
--- source/ariba/SideportListener.cpp	(revision 5772)
+++ source/ariba/SideportListener.cpp	(revision 5773)
@@ -107,22 +107,16 @@
 SideportListener::Protocol SideportListener::getReachabilityProtocol(const NodeID& node){
 	int ret = SideportListener::undefined;
-	if( overlay == NULL ){
-		cout << "XXXXXXXXXXXXx invalid overlay" << std::endl;
-		return (Protocol)ret;
-	}
+	if( overlay == NULL ) return (Protocol)ret;
 
 	using namespace ariba::addressing;
 
 	LinkDescriptor* link = overlay->getSendDescriptor(node);
-	if (link==NULL){
-		cout << "XXXXXXXXXXXXx invalid linkdescriptor for " << node.toString() << std::endl;
-		return (Protocol)ret;
-	}
+	if (link==NULL) return (Protocol)ret;
 
 	BaseCommunication::LinkDescriptor& bclink =
 		overlay->bc->queryLocalLink(link->communicationId);
 
-	if(bclink.isUnspecified() || bclink.localLocator == NULL){
-		cout << "XXXXXXXXXXXXx bclink for node " << node.toString() << std::endl;
+	if(bclink.isUnspecified() || bclink.remoteLocator == NULL){
+		cout << "XXXXXXXXXXXXx invalid bclink for node " << node.toString() << std::endl;
 		return (Protocol)ret;
 	}