--- a/metadataengine/client/src/mdeobject.cpp	Fri Jun 25 13:56:30 2010 +0100
+++ b/metadataengine/client/src/mdeobject.cpp	Thu Jul 22 16:38:01 2010 +0100
@@ -122,7 +122,7 @@
 	}
 
 CMdEObject::CMdEObject(CMdESession* aSession, TItemId aId, CMdEObjectDef& aDef)
-		: CMdEInstanceItem( aSession, aId ), iDef( &aDef )
+		: CMdEInstanceItem( aSession, aId ), iDef( &aDef ), iUri( NULL )
 	{
 	}
 
@@ -145,6 +145,7 @@
 		}
 
 	delete iUri;
+	iUri = NULL;
 
 	iPropertyArray.ResetAndDestroy();
 	iPropertyArray.Close();
@@ -276,6 +277,7 @@
 		}
 
 	iUri = HBufC::NewL( aUri.Length() );
+	// Note: CopyLC doesn't push anything to cleanup stack
 	iUri->Des().CopyLC( aUri );
 	iFlags |= EMdEObjectFlagModObject;
 	}