--- a/metadataengine/client/src/mdeharvestersession.cpp	Wed Sep 15 12:40:59 2010 +0300
+++ b/metadataengine/client/src/mdeharvestersession.cpp	Wed Oct 13 15:02:02 2010 +0300
@@ -45,7 +45,6 @@
 	{
 	iHarvestingPrioritizationChunk.Close();
 	delete iHarvestingPrioritizationSerializationBuffer;
-	iHarvestingPrioritizationSerializationBuffer = NULL;
 	}
 
 void CMdEHarvesterSession::ConstructL()
@@ -113,20 +112,12 @@
 		}
 
 	// Note: CopyLC doesn't push anything to cleanup stack
-	TRAPD(err, uri->Des().CopyLC( aUri ));
+	uri->Des().CopyLC( aUri );
 
-	if(err != KErrNone)
-	    {
-		delete uri;
-		uri = NULL;
-		return EFalse;
-	    }
-		
 	const TBool ret = iSession->EngineSession().DoSetFileToPresent( 
-	aMediaId, *uri, aFileInfo );
+			aMediaId, *uri, aFileInfo );
 	
 	delete uri;
-	uri = NULL;
 
 	return ret;
 	}
@@ -138,10 +129,8 @@
 	WRITELOG( "CMdEHarvesterSession::SetFilesToPresentL -- Start" );
 	if( aUris.Count() != aFileInfos.Count() )
 		{
-#ifdef _DEBUG
 		WRITELOG2( "CMdEHarvesterSession::SetFilesToPresentL -- Leave (%d, %d)", 
 				aUris.Count(), aFileInfos.Count() );
-#endif
 		User::Leave( KErrArgument );
 		}