diff --git a/executor/executor.go b/executor/executor.go
index c84c81b..7505ce9 100644
--- a/executor/executor.go
+++ b/executor/executor.go
@@ -118,6 +118,8 @@ func doRunSetupCommand(emitter screwdriver.Emitter, f *os.File, r io.Reader, set
 
 	t, err = readln(reader)
 	for err == nil {
+		t = strings.TrimLeft(t, "# ")
+		t = strings.TrimLeft(t, "$ ")
 		echoCmd := reEcho.FindStringSubmatch(t)
 		if len(echoCmd) != 0 {
 			_, werr := fmt.Fprintln(emitter, t)
@@ -287,7 +289,7 @@ func Run(path string, env []string, emitter screwdriver.Emitter, build screwdriv
 			"EXITCODE=$?; " +
 			exportEnvCmd +
 			"echo $SD_STEP_ID $EXITCODE; }", //mv newfile to file
-		"trap finish ABRT EXIT;\n\n",
+		"trap finish ABRT EXIT;\necho ;\n",
 	}
 
 	setupReader := bufio.NewReader(f)