--- a/datacommsserver/esockserver/CoreProviders/src/coretiernotificationstates.cpp	Thu Dec 17 09:22:25 2009 +0200
+++ b/datacommsserver/esockserver/CoreProviders/src/coretiernotificationstates.cpp	Thu Jan 07 13:34:53 2010 +0200
@@ -110,7 +110,7 @@
 EXPORT_DEFINE_SMELEMENT(TAwaitingCancelOrErrorOrDestroy, NetStateMachine::MState, TierNotification::TContext)
 EXPORT_C TBool TAwaitingCancelOrErrorOrDestroy::Accept()
 	{
-	return(	iContext.iMessage.IsMessage<TEBase::TCancel>() ||
+	return(	( iContext.iMessage.IsMessage<TEBase::TCancel>() && iContext.Activity()->FindOriginator(iContext.iSender) != KErrNotFound ) ||
 			iContext.iMessage.IsMessage<TEBase::TError>() ||
 			iContext.iMessage.IsMessage<TEChild::TDestroy>() );
 	}