diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
index 6a3552ef632..06a4a86fb2d 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
@@ -342,7 +342,8 @@ public class SCMDatanodeProtocolServer implements
               ((ReplicateContainerCommand)cmd).getProto())
           .build();
     default:
-      throw new IllegalArgumentException("Not implemented");
+      throw new IllegalArgumentException("Scm command " +
+          cmd.getType().toString() + " is not implemented");
     }
   }