Index: /branches/eraser6/Manager/DirectExecutor.cs
===================================================================
--- /branches/eraser6/Manager/DirectExecutor.cs	(revision 1050)
+++ /branches/eraser6/Manager/DirectExecutor.cs	(revision 1051)
@@ -878,5 +878,15 @@
 				{
 					DirectoryInfo info = new DirectoryInfo(fldr.Path);
-					if (info.GetFiles("*", SearchOption.AllDirectories).Length == 0)
+
+					//See if this is the root of a volume.
+					bool isVolumeRoot = info.Parent == null;
+					foreach (VolumeInfo volume in VolumeInfo.Volumes)
+						foreach (string mountPoint in volume.MountPoints)
+							if (info.FullName == mountPoint)
+								isVolumeRoot = true;
+
+					//If the folder is a mount point, then don't delete it. If it isn't,
+					//search for files under the folder to see if it is empty.
+					if (!isVolumeRoot && info.GetFiles("*", SearchOption.AllDirectories).Length == 0)
 					{
 						FileSystem fsManager = FileSystem.Get(VolumeInfo.FromMountpoint(fldr.Path));