diff --git a/xl-v1-multipart-common.go b/xl-v1-multipart-common.go
index e36b34a84..aefe18264 100644
--- a/xl-v1-multipart-common.go
+++ b/xl-v1-multipart-common.go
@@ -279,18 +279,15 @@ func (xl xlObjects) commitXLMetadata(srcPrefix, dstPrefix string) error {
 		// Rename `xl.json` in a routine.
 		go func(index int, disk StorageAPI) {
 			defer wg.Done()
+			// Delete any dangling directories.
+			defer disk.DeleteFile(minioMetaBucket, srcPrefix)
+
 			// Renames `xl.json` from source prefix to destination prefix.
 			rErr := disk.RenameFile(minioMetaBucket, srcJSONFile, minioMetaBucket, dstJSONFile)
 			if rErr != nil {
 				mErrs[index] = rErr
 				return
 			}
-			// Delete any dangling directories.
-			dErr := disk.DeleteFile(minioMetaBucket, srcPrefix)
-			if dErr != nil {
-				mErrs[index] = dErr
-				return
-			}
 			mErrs[index] = nil
 		}(index, disk)
 	}