diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
index 78693f72140c..5f829498bff7 100644
--- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
+++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
@@ -145,8 +145,8 @@ public void with(ModuleDefinition def, Stack<ModuleDefinition> parents) {
                         logger.debug("Failed to obtain module context: ", e);
                     }
                 } catch (BeansException e) {
-                    logger.error("Failed to load module [{}] due to: {}", def.getName(), e);
-                    throw new RuntimeException(String.format("Failed to load module [%s]", def.getName()));
+                    logger.error("Failed to load module [{}]", def.getName(), e);
+                    throw new RuntimeException(String.format("Failed to load module [%s]", def.getName()), e);
                 }
             }
         });
diff --git a/utils/src/main/java/com/cloud/utils/script/Script.java b/utils/src/main/java/com/cloud/utils/script/Script.java
index 5a92d12eeda9..96d1f9ffe144 100644
--- a/utils/src/main/java/com/cloud/utils/script/Script.java
+++ b/utils/src/main/java/com/cloud/utils/script/Script.java
@@ -371,7 +371,7 @@ private String executeInternal(OutputInterpreter interpreter, Map<String, String
 
             String error;
             if (interpreter != null) {
-                error = interpreter.processError(reader);
+                error = interpreter.drain() ? task.getResult() : interpreter.processError(reader);
             } else {
                 error = String.valueOf(_process.exitValue());
             }
@@ -494,7 +494,7 @@ public String executeIgnoreExitValue(OutputInterpreter interpreter, int exitValu
 
             String error;
             if (interpreter != null) {
-                error = interpreter.processError(reader);
+                error = interpreter.drain() ? task.getResult() : interpreter.processError(reader);
             } else {
                 error = String.valueOf(_process.exitValue());
             }