diff --git a/cmd/fs-v1-helpers.go b/cmd/fs-v1-helpers.go
index 057da9d29..597dd71e5 100644
--- a/cmd/fs-v1-helpers.go
+++ b/cmd/fs-v1-helpers.go
@@ -61,6 +61,8 @@ func fsRemoveAll(dirPath string) (err error) {
 	if err = removeAll(dirPath); err != nil {
 		if os.IsPermission(err) {
 			return traceError(errVolumeAccessDenied)
+		} else if isSysErrNotEmpty(err) {
+			return traceError(errVolumeNotEmpty)
 		}
 		return traceError(err)
 	}