--- a/metadataengine/client/src/mdesessionimpl.cpp	Thu Jul 15 19:07:24 2010 +0300
+++ b/metadataengine/client/src/mdesessionimpl.cpp	Thu Aug 19 10:20:41 2010 +0300
@@ -241,6 +241,7 @@
     iSessionObserver = NULL;
 
 	delete iSchemaBuffer;
+	iSchemaBuffer = NULL;
 
 	iNotifiers.ResetAndDestroy();
 	iNotifiers.Close();
@@ -254,8 +255,10 @@
 	iNamespaceDefs.Close();
 	
 	delete iSessionStartupAO;
+	iSessionStartupAO = NULL;
 		
 	delete iAsyncHandler;
+	iAsyncHandler = NULL;
 	}
 
 void CMdESessionImpl::ConstructL()
@@ -359,7 +362,8 @@
     		{
     		User::Leave( KErrMdENotLocked );
     		}
-		items.Append( obj );
+    	
+    	items.AppendL( obj );
     	}
 
     UpdateItemsL(items);
@@ -536,6 +540,7 @@
 		}
 
 	delete iSchemaBuffer;
+	iSchemaBuffer = NULL;
 
 	iSchemaBuffer = schemaBuffer;
 	
@@ -2694,6 +2699,7 @@
     {
     const TInt index = iNotifiers.Find( aNotifier );
     delete aNotifier;
+    aNotifier = NULL;
     iNotifiers.Remove( index );
     }