diff --git a/source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java b/source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java
index 4365ca63b..7c078aeaf 100644
--- a/source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java
+++ b/source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java
@@ -1162,7 +1162,7 @@ public boolean stopServer(TestCaseExecution tce) {
 
                         // Log Execution
                         if ((tce.getVerbose() > 0)
-                                && !(tce.getControlStatus().equals(TestCaseExecution.CONTROLSTATUS_KO))
+                                && !tce.getControlStatus().equals(TestCaseExecution.CONTROLSTATUS_OK)
                                 && parameterService.getParameterBooleanByKey("cerberus_executionloghar_enable", tce.getSystem(), true)) {
                             try {
                                 tce.addFileList(recorderService.recordHar(tce, har));
diff --git a/source/src/main/java/org/cerberus/core/servlet/crud/test/UpdateTestCaseWithDependencies.java b/source/src/main/java/org/cerberus/core/servlet/crud/test/UpdateTestCaseWithDependencies.java
index 54925657d..8c5cb984d 100644
--- a/source/src/main/java/org/cerberus/core/servlet/crud/test/UpdateTestCaseWithDependencies.java
+++ b/source/src/main/java/org/cerberus/core/servlet/crud/test/UpdateTestCaseWithDependencies.java
@@ -257,7 +257,10 @@ private List<TestCaseCountryProperties> getTestCaseCountryPropertiesFromParamete
             String type = propJson.getString("type");
             String value = propJson.getString("value1");
             String value2 = propJson.getString("value2");
-            String value3 = propJson.getString("value3");
+            String value3 = "";
+            if (propJson.has("value3")) {
+                value3 = propJson.getString("value3");
+            }
             String length = propJson.getString("length");
             int rowLimit = propJson.getInt("rowLimit");
             int retryNb = propJson.optInt("retryNb");
@@ -415,8 +418,8 @@ private List<TestCaseStepActionControl> getTestCaseStepActionControlsFromParamet
             String description = controlJson.getString("description");
             String screenshot = controlJson.getString("screenshotFileName");
             if (!delete) {
-                testCaseStepActionControl.add(testCaseStepActionControlFactory.create(test, testCase, stepId, actionId, controlId, sort, 
-                        conditionOperator, conditionValue1, conditionValue2, conditionValue3, conditionOptions, 
+                testCaseStepActionControl.add(testCaseStepActionControlFactory.create(test, testCase, stepId, actionId, controlId, sort,
+                        conditionOperator, conditionValue1, conditionValue2, conditionValue3, conditionOptions,
                         controlValue, value1, value2, value3, options, isFatal, description, screenshot, doScreenshotBefore, doScreenshotAfter, waitBefore, waitAfter));
             }
         }