diff -r b9e74fff3740 -r e4175d61d967 messagingfw/msgsrvnstore/server/src/MTCLBASE.CPP --- a/messagingfw/msgsrvnstore/server/src/MTCLBASE.CPP Mon Jun 21 16:13:01 2010 +0300 +++ b/messagingfw/msgsrvnstore/server/src/MTCLBASE.CPP Thu Jul 15 19:11:10 2010 +0300 @@ -687,10 +687,12 @@ */ EXPORT_C void CBaseMtm::CancelAttachmentOperation() { - __ASSERT_ALWAYS(iAttachmentWaiter != NULL, PanicServer(EMsvOperationNotFound)); - iAttachmentWaiter->Cancel(); - delete iAttachmentWaiter; - iAttachmentWaiter = NULL; + if(iAttachmentWaiter) + { + iAttachmentWaiter->Cancel(); + delete iAttachmentWaiter; + iAttachmentWaiter = NULL; + } }