diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
index 2a1e431056..2519f49e39 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
@@ -184,7 +184,8 @@ public void submitPlan(String planId, long planVersion, String planFileName,
     try {
       checkDiskBalancerEnabled();
       if ((this.future != null) && (!this.future.isDone())) {
-        LOG.error("Disk Balancer - Executing another plan, submitPlan failed.");
+        LOG.error("Disk Balancer - Executing another plan (Plan File: {}, Plan ID: {}), " +
+            "submitPlan failed.", planFile, planID);
         throw new DiskBalancerException("Executing another plan",
             DiskBalancerException.Result.PLAN_ALREADY_IN_PROGRESS);
       }
@@ -523,7 +524,7 @@ private void createWorkPlan(NodePlan plan) throws DiskBalancerException {
 
       String sourceVolBasePath = storageIDToVolBasePathMap.get(sourceVolUuid);
       if (sourceVolBasePath == null) {
-        final String errMsg = "Disk Balancer - Unable to find volume: "
+        final String errMsg = "Disk Balancer - Unable to find source volume: "
             + step.getSourceVolume().getPath() + ". SubmitPlan failed.";
         LOG.error(errMsg);
         throw new DiskBalancerException(errMsg,
@@ -532,7 +533,7 @@ private void createWorkPlan(NodePlan plan) throws DiskBalancerException {
 
       String destVolBasePath = storageIDToVolBasePathMap.get(destVolUuid);
       if (destVolBasePath == null) {
-        final String errMsg = "Disk Balancer - Unable to find volume: "
+        final String errMsg = "Disk Balancer - Unable to find dest volume: "
             + step.getDestinationVolume().getPath() + ". SubmitPlan failed.";
         LOG.error(errMsg);
         throw new DiskBalancerException(errMsg,
@@ -1058,7 +1059,7 @@ public void copyBlocks(VolumePair pair, DiskBalancerWorkItem item) {
       FsVolumeSpi source = getFsVolume(this.dataset, sourceVolUuid);
       if (source == null) {
         final String errMsg = "Disk Balancer - Unable to find source volume: "
-            + pair.getDestVolBasePath();
+            + pair.getSourceVolBasePath();
         LOG.error(errMsg);
         item.setErrMsg(errMsg);
         return;