diff --git a/bin/democratic-csi b/bin/democratic-csi
index 0a51f2e..79ded9d 100755
--- a/bin/democratic-csi
+++ b/bin/democratic-csi
@@ -194,6 +194,9 @@ async function requestHandlerProxy(call, callback, serviceMethodName) {
     let message;
     if (e instanceof Error) {
       message = e.toString();
+      if (e.stack) {
+        message += ` ${e.stack}`;
+      }
     } else {
       message = JSON.stringify(e);
     }
diff --git a/src/driver/controller-zfs-generic/index.js b/src/driver/controller-zfs-generic/index.js
index db27b62..31c0fa7 100644
--- a/src/driver/controller-zfs-generic/index.js
+++ b/src/driver/controller-zfs-generic/index.js
@@ -26,7 +26,7 @@ class ControllerZfsGenericDriver extends ControllerZfsBaseDriver {
       const options = {};
       options.executor = new ZfsSshProcessManager(execClient);
       options.idempotent = true;
-  
+
       if (
         this.options.zfs.hasOwnProperty("cli") &&
         this.options.zfs.cli &&
@@ -34,13 +34,13 @@ class ControllerZfsGenericDriver extends ControllerZfsBaseDriver {
       ) {
         options.paths = this.options.zfs.cli.paths;
       }
-  
+
       options.sudo = _.get(this.options, "zfs.cli.sudoEnabled", false);
-  
+
       if (typeof this.setZetabyteCustomOptions === "function") {
         await this.setZetabyteCustomOptions(options);
       }
-  
+
       return new Zetabyte(options);
     });
   }
@@ -406,7 +406,7 @@ delete ${iscsiName}
       options
     );
     if (response.code != 0) {
-      throw new Error(response.stderr);
+      throw new Error(JSON.stringify(response));
     }
     driver.ctx.logger.verbose(
       "TargetCLI response: " + JSON.stringify(response)