diff -r e42293e811d8 -r 6c1dfe4da5dd mmappcomponents/harvester/filehandler/src/mpxfolderscanner.cpp
--- a/mmappcomponents/harvester/filehandler/src/mpxfolderscanner.cpp	Thu Aug 19 10:24:28 2010 +0300
+++ b/mmappcomponents/harvester/filehandler/src/mpxfolderscanner.cpp	Tue Aug 31 15:41:40 2010 +0300
@@ -192,14 +192,6 @@
         do
             {
             TRAP(err, iDirScan->NextL(iDir));
-            if( !iDir && !err ) 
-                {
-                // if iDir NULL and no error, there are no 
-                // more directories in the structure
-                // in this case there is no leaving functions called before
-                // returning err has to be 0
-                break;
-                }
             blocked = iObserver.IsPathBlockedL( iDirScan->FullPath() );
             if( blocked )
                 {
@@ -254,14 +246,6 @@
                 {
                 MPX_DEBUG1("CMPXFolderScanner::SetupNextDriveToScanL iDirScan->NextL()");
                 TRAP(err, iDirScan->NextL(iDir));
-                if( !iDir && !err ) 
-                    {
-                    // if iDir NULL and no error, there are no 
-                    // more directories in the structure
-                    // in this case there is no leaving functions called before
-                    // returning err has to be 0
-                    break;
-                    }
                 MPX_DEBUG2("CMPXFolderScanner::SetupNextDriveToScanL path %S", &iDirScan->FullPath());
                 blocked = iObserver.IsPathBlockedL( iDirScan->FullPath() );
                 MPX_DEBUG2("CMPXFolderScanner::SetupNextDriveToScanL path blocked %i", blocked);