--- a/harvester/monitorplugins/mmcplugin/src/mmcscannerao.cpp	Wed Sep 15 12:40:59 2010 +0300
+++ b/harvester/monitorplugins/mmcplugin/src/mmcscannerao.cpp	Wed Oct 13 15:02:02 2010 +0300
@@ -82,7 +82,6 @@
 	// Delete instance variables if any
 	
 	delete iMmcFileList;
-	iMmcFileList = NULL;
 	
 	iEntryArray.ResetAndDestroy();
 	iEntryArray.Close();
@@ -108,14 +107,6 @@
 		{
 		case( EUninitialized ):
 			{
-		    WRITELOG("CMmcScannerAO::RunL - Starting processing");
-		    if( iMediaId == 0 )
-		        {
-		        WRITELOG("CMmcScannerAO::RunL - MediaId == 0 -> end");
-                SetState( EDone );
-                break;		    
-		        }
-		    
 			WRITELOG("CMmcScannerAO::RunL - Setting files to not present");
 			iMdEClient->SetFilesToNotPresent( iMediaId, ETrue );
 			SetState( EReadFiles );
@@ -257,7 +248,6 @@
 			hd->SetEventType( EHarvesterEdit );
 			hd->SetObjectType( ENormal );
 			delete ei;
-			ei = NULL;
 			}
 		else
 			{
@@ -265,12 +255,7 @@
 			hd->SetObjectType( EPlaceholder );
 			hd->SetClientData( ei );
 			}
-			
-		if(iHdArray.Append( hd ) != KErrNone )
-		    {
-            delete hd;
-            hd = NULL;
-		    }
+		iHdArray.Append( hd );
         iHarvestEntryArray.Remove( i );
         }