Index: source/ariba/communication/BaseCommunication.cpp
===================================================================
--- source/ariba/communication/BaseCommunication.cpp	(revision 5624)
+++ source/ariba/communication/BaseCommunication.cpp	(revision 5628)
@@ -58,4 +58,5 @@
 /// adds an endpoint to the list
 void BaseCommunication::add_endpoint( const address_v* endpoint ) {
+	if (endpoint==NULL) return;
 	BOOST_FOREACH( endpoint_reference& ref, remote_endpoints ) {
 		if (*ref.endpoint == *endpoint) {
@@ -72,4 +73,5 @@
 /// removes an endpoint from the list
 void BaseCommunication::remove_endpoint( const address_v* endpoint ) {
+	if (endpoint==NULL) return;
 	for (vector<endpoint_reference>::iterator i = remote_endpoints.begin();
 		i != remote_endpoints.end(); i++) {