--- a/commsfwsupport/commselements/meshmachine/src/mm_node.cpp	Mon May 24 18:49:19 2010 +0100
+++ b/commsfwsupport/commselements/meshmachine/src/mm_node.cpp	Tue Jul 20 18:12:15 2010 +0100
@@ -198,11 +198,11 @@
 	__ASSERT_DEBUG(!client->RecipientId().IsNull(), User::Panic(KSpecAssert_ElemMeshMachNodC, 1));
 	AbortActivitiesOriginatedBy(aContext, client->RecipientId());
 
+    if (aContext.iSender == aClientId)
+        {
+        aContext.iPeer = NULL;
+        }	
 	ANodeBase::RemoveClient(foundAt);
-   	if (aContext.iSender == aClientId)
-   	    {
-   	    aContext.iPeer = NULL;
-   	    }
 	}
 
 EXPORT_C CNodeActivityBase* AMMNodeBase::FindActivityById(TUint aActivityId) const