diff --git a/exec.go b/exec.go
index 8f33b7c..684b0fd 100644
--- a/exec.go
+++ b/exec.go
@@ -101,9 +101,9 @@ func runInput(input string, priv bool) {
 					cmdFinish(0, input, priv)
 					return
 				}
-				input, exitCode, err, cont = handleSh(input)
+				input, exitCode, cont, err = handleSh(input)
 			case "hybridRev":
-				_, _, err, cont = handleSh(input)
+				_, _, _, err = handleSh(input)
 				if err == nil {
 					cmdFinish(0, input, priv)
 					return
@@ -112,7 +112,7 @@ func runInput(input string, priv bool) {
 			case "lua":
 				input, exitCode, err = handleLua(cmdString)
 			case "sh":
-				input, exitCode, err, cont = handleSh(input)
+				input, exitCode, cont, err = handleSh(input)
 		}
 	} else {
 		// can only be a string or function so
@@ -197,25 +197,25 @@ func handleLua(cmdString string) (string, uint8, error) {
 	return cmdString, 125, err
 }
 
-func handleSh(cmdString string) (string, uint8, error, bool) {
+func handleSh(cmdString string) (string, uint8, bool, error) {
 	_, _, err := execCommand(cmdString, true)
 	if err != nil {
 		// If input is incomplete, start multiline prompting
 		if syntax.IsIncomplete(err) {
 			if !interactive {
-				return cmdString, 126, err, false
+				return cmdString, 126, false, err
 			}
-			return cmdString, 126, err, true
+			return cmdString, 126, true, err
 		} else {
 			if code, ok := interp.IsExitStatus(err); ok {
-				return cmdString, code, nil, false
+				return cmdString, code, false, nil
 			} else {
-				return cmdString, 126, err, false
+				return cmdString, 126, false, err
 			}
 		}
 	}
 
-	return cmdString, 0, nil, false
+	return cmdString, 0, false, nil
 }
 
 // Run command in sh interpreter
diff --git a/runnermode.go b/runnermode.go
index b4b4178..eca33ba 100644
--- a/runnermode.go
+++ b/runnermode.go
@@ -28,7 +28,7 @@ func shRunner(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 		return nil, err
 	}
 
-	input, exitCode, err, cont := handleSh(cmd)
+	input, exitCode, cont, err := handleSh(cmd)
 	var luaErr rt.Value = rt.NilValue
 	if err != nil {
 		luaErr = rt.StringValue(err.Error())