--- a/metadataengine/client/src/mdeobject.cpp	Thu Jul 15 19:07:24 2010 +0300
+++ b/metadataengine/client/src/mdeobject.cpp	Thu Aug 19 10:20:41 2010 +0300
@@ -582,6 +582,7 @@
 		CMdEProperty* oldProperty = iPropertyArray[f];
 		iPropertyArray[f] = &aProperty;
 		delete oldProperty;
+		oldProperty = NULL;
 		}
 	else if (err < KErrNone)
 		{
@@ -743,6 +744,7 @@
             CMdEProperty* oldProperty = iPropertyArray[f];
             iPropertyArray[f] = aObject.iPropertyArray[i];
             delete oldProperty;
+            oldProperty = NULL;
             }
         else if (err < KErrNone)
             {
@@ -817,6 +819,7 @@
         if ( prop->Removed() )
         	{
         	delete prop;
+        	prop = NULL;
         	iPropertyArray.Remove( i );
         	continue;
         	}
@@ -1055,6 +1058,7 @@
 		        CMdEProperty* oldProperty = newObject->iPropertyArray[f];
 		        newObject->iPropertyArray[f] = property;
 		        delete oldProperty;
+		        oldProperty = NULL;
 		        }
 		    else if (err < KErrNone)
 		        {