Index: source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- source/ariba/overlay/BaseOverlay.cpp	(revision 5733)
+++ source/ariba/overlay/BaseOverlay.cpp	(revision 5734)
@@ -1149,6 +1149,6 @@
 			// no link descriptor available -> error!
 			if( ld == NULL ) {
-				logging_warn( "received overlay update message for link " <<
-						ld->overlayId.toString() << " for which we have no mapping" );
+				logging_warn( "received overlay update message for link for "
+						<< "which we have no mapping" );
 				ret = false;
 				break;
@@ -1477,5 +1477,5 @@
 
 			LinkDescriptor* rld = getDescriptor( overlayMsg->getRelayLink() );
-			if (rld == NULL) {
+			if (rld == NULL || ld == NULL) {
 				logging_error("Direct link replacement: Link "
 						<< overlayMsg->getRelayLink() << "not found error." );