Index: shlfileop.cpp
===================================================================
--- shlfileop.cpp	(revision 53374)
+++ shlfileop.cpp	(working copy)
@@ -1130,8 +1130,12 @@
             add_file_to_entry(file, szCurFile);
             file->attributes = GetFileAttributesW( file->szFullPath );
             file->bExists = (file->attributes != INVALID_FILE_ATTRIBUTES);
-            if (!file->bExists) flList->bAnyDontExist = TRUE;
-            if (IsAttribDir(file->attributes)) flList->bAnyDirectories = TRUE;
+
+            if (!file->bExists)
+                flList->bAnyDontExist = TRUE;
+
+            if (IsAttribDir(file->attributes))
+                flList->bAnyDirectories = TRUE;
         }

         /* advance to the next string */
@@ -1457,7 +1461,7 @@
             bPathExists = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE);

         if (!bPathExists)
-            return ERROR_PATH_NOT_FOUND;
+            return ERROR_FILE_NOT_FOUND;
     }

     return ERROR_SUCCESS;