--- a/messagingappbase/obexmtms/obexmtm/obexutil/source/obexMtmUtil.cpp	Tue Feb 02 00:08:43 2010 +0200
+++ b/messagingappbase/obexmtms/obexmtm/obexutil/source/obexMtmUtil.cpp	Fri Apr 16 14:56:15 2010 +0300
@@ -36,7 +36,7 @@
 
 //
 //
-//  Class for externalising a set of filenames to the same message entry store. Rolls back if not explicitely committed.
+//  Class for externalising a set of filenames to the same message entry store. Rolls back if not explicitly committed.
 //
 
 // Static functions that do the whole process in one go:
@@ -84,7 +84,7 @@
 * Static function to read in one filename from the store.
 *
 * @param aEntry entry to read the filename from
-* @param aFileName Descriptor to recieve the new filename. Any existing data will be overwritten. MUST be long enough to contain the name.
+* @param aFileName Descriptor to receive the new filename. Any existing data will be overwritten. MUST be long enough to contain the name.
 * @leave KErrXXX system wide error codes.
 */	
 	{
@@ -165,7 +165,8 @@
 	if(! iHaveCommitted)
 		{
 		iMessageWriteStream.Close();  
-		iMessageStore->Revert();  // Don't commit. Should have been called explicitly using CommitStoreL().
+		if(iMessageStore)
+		    iMessageStore->Revert();  // Don't commit. Should have been called explicitly using CommitStoreL().
 		}
 	delete iMessageStore;
 	delete iEntry;