--- a/metadataengine/client/src/mdequery.cpp	Thu Jul 15 19:07:24 2010 +0300
+++ b/metadataengine/client/src/mdequery.cpp	Thu Aug 19 10:20:41 2010 +0300
@@ -46,13 +46,15 @@
   
     // This will destroy the entire conditions tree.
    	delete iConditions;
-
+   	iConditions = NULL;
+   	
     // Destroy all result items this query instance owns.
    	for( TInt i = iResults.Count() - 1; i >=0; i-- )
         {
         if(iResults[i].iOwned)
             {
             delete iResults[i].iItem;
+            iResults[i].iItem = NULL;
             }
         }
 
@@ -77,6 +79,7 @@
     iObservers.Close();
 
    	delete iDistinctResults;
+   	iDistinctResults = NULL;
 	}
 
 
@@ -154,6 +157,7 @@
         if(iResults[i].iOwned)
             {
             delete iResults[i].iItem;
+            iResults[i].iItem = NULL;
             }
         }
 	iResults.Reset();