--- a/messagingfw/biomsgfw/BITSSRC/BioTestUtils.cpp	Tue Oct 05 13:50:47 2010 +0530
+++ b/messagingfw/biomsgfw/BITSSRC/BioTestUtils.cpp	Tue Oct 19 11:59:06 2010 +0530
@@ -905,7 +905,10 @@
 	// client side
 	__ASSERT_ALWAYS(iMsvSession, User::Panic(BIOTEST_PANIC, KErrBIONotOnClientSide));
 	if(iClientMtmRegistry)
-		delete iClientMtmRegistry;
+		{
+	    delete iClientMtmRegistry;
+	    iClientMtmRegistry = NULL;
+		}
 	iClientMtmRegistry = CClientMtmRegistry::NewL(*iMsvSession);
 	iBioClientMtm = (CBIOClientMtm*) iClientMtmRegistry->NewMtmL(KUidMsgTypeSmartMessage);
 	}
@@ -995,7 +998,10 @@
 	// Set the session path for the RFs
 	SetSessionPath(aFileDirectory);
 	if (iDir) 
-		delete iDir;
+		{
+	    delete iDir;
+	    iDir = NULL;
+		}
 	User::LeaveIfError(iFs.GetDir(_L("*.txt"), KEntryAttNormal, ESortByName, iDir));
     TInt count = iDir->Count();
     if(count == 0)
@@ -1187,6 +1193,7 @@
 	TInt messageLength = richText->DocumentLength();
 
 	delete iMessageBody;
+	iMessageBody = NULL;
 	iMessageBody = HBufC::NewL(messageLength);
 	TPtr messDes = iMessageBody->Des();