diff -r 3a6baaa22be8 -r b66b8f3a7fd8 messagingfw/msgsrvnstore/server/src/MTCLBASE.CPP --- a/messagingfw/msgsrvnstore/server/src/MTCLBASE.CPP Tue Jul 06 22:57:17 2010 +0530 +++ b/messagingfw/msgsrvnstore/server/src/MTCLBASE.CPP Wed Jul 21 02:03:54 2010 +0530 @@ -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; + } }