diff --git a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
index c981441..fc0d874 100644
--- a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
+++ b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
@@ -97,7 +97,7 @@ public class ScenarioExecutionService {
                 scenarioOutput.setStatus("IN_PROGRESS");
             }
             
-            if(scenarioExecution.getLatestStepStatus().equals("ERROR")){
+            if(scenarioExecution.getLatestStepStatus()!= null && scenarioExecution.getLatestStepStatus().equals("ERROR")){
                 scenarioOutput.setScenarioExecution_id(scenarioExecution.getId());
                 scenarioOutput.setStatus("ERROR");
                 scenarioOutput.setMessage(scenarioExecution.getLatestStepOutput());
@@ -175,7 +175,7 @@ public class ScenarioExecutionService {
                 ScenarioStep step = steps.stream().filter(s -> s.getStepId().equals(scenarioExecution.getNextStepId())).findFirst().orElse(null);
                 executeScenarioStep(step, scenarioExecution);
 
-                if(scenarioExecution.getLatestStepStatus().equals("ERROR")){
+                if(scenarioExecution.getLatestStepStatus() != null && scenarioExecution.getLatestStepStatus().equals("ERROR")){
                     logger.error("Error while executing step: " + step.getStepId());
                     break;
                 }