--- a/harvester/composerplugins/imagecomposer/src/composerimageplugin.cpp	Fri Mar 19 09:38:01 2010 +0200
+++ b/harvester/composerplugins/imagecomposer/src/composerimageplugin.cpp	Fri Apr 16 15:23:55 2010 +0300
@@ -197,7 +197,9 @@
     CMdEObjectDef& imageObjDef = defaultNamespace.GetObjectDefL( MdeConstants::Image::KImageObject );
     CMdEObjectDef& locationObjDef = defaultNamespace.GetObjectDefL( MdeConstants::Location::KLocationObject );
 	CMdEObject* object = iSession->GetObjectL( aObjectId, imageObjDef );
+	CleanupStack::PushL( object );
 	CMdEObject* location = iSession->GetObjectL( locationId, locationObjDef );
+	CleanupStack::PushL( location );
 	
 	if( object && location )
 		{
@@ -208,7 +210,7 @@
 			iMdEHarvesterSession->ResetPendingL( objectId );
 			}
 		}
-	CleanupStack::PopAndDestroy( &objectId );
+	CleanupStack::PopAndDestroy( 3, &objectId );
 	}
 
 void CComposerImagePlugin::HandlePendingObjects( const RArray<TItemId>& aObjectIdArray )