diff --git a/main.go b/main.go
index 115881f..e4b1874 100644
--- a/main.go
+++ b/main.go
@@ -69,6 +69,9 @@ func main() {
 	logger.Debug().Msg("Loki URL : " + conf.GetConfig().LokiURL)
 	logger.Debug().Msg("Workflow executed : " + conf.GetConfig().ExecutionID)
 	exec := u.GetExecution(conf.GetConfig().ExecutionID)
+	if exec == nil {
+		logger.Fatal().Msg("Could not retrieve workflow ID from execution ID " + conf.GetConfig().ExecutionID + " on peer " + conf.GetConfig().PeerID)
+	}
 	conf.GetConfig().WorkflowID = exec.WorkflowID
 
 	logger.Debug().Msg("Starting construction of yaml argo for workflow :" + exec.WorkflowID)
@@ -83,8 +86,6 @@ func main() {
 
 	err := new_wf.LoadFrom(conf.GetConfig().WorkflowID, conf.GetConfig().PeerID)
 	if err != nil {
-
-
 		logger.Error().Msg("Could not retrieve workflow " + conf.GetConfig().WorkflowID + " from oc-catalog API")
 	}
 
@@ -96,7 +97,7 @@ func main() {
 
 	argoFilePath, err := builder.CompleteBuild(exec.ExecutionsID)
 	if err != nil {
-		logger.Error().Msg(err.Error())
+		logger.Error().Msg("Error when completing the build of the workflow: " + err.Error())
 	}
 
 	workflowName = getContainerName(argoFilePath)
@@ -112,7 +113,7 @@ func main() {
 		// Executed in a k8s environment
 		logger.Info().Msg("Executes inside a k8s")
 		// executeInside(exec.GetID(), "argo", argo_file_path, stepMax)  // commenting to use conf.ExecutionID instead of exec.GetID()
-		executeInside(conf.GetConfig().ExecutionID, conf.GetConfig().ExecutionID, argoFilePath)
+		executeInside(conf.GetConfig().ExecutionID, exec.ExecutionsID, argoFilePath)
 	}
 }