diff --git a/passes/opt/opt_muxtree.cc b/passes/opt/opt_muxtree.cc
index e1424f94e..525bd4e0a 100644
--- a/passes/opt/opt_muxtree.cc
+++ b/passes/opt/opt_muxtree.cc
@@ -144,6 +144,9 @@ struct OptMuxtreeWorker
 		// Analyze port A
 		muxinfo.ports.push_back(used_port_bit(sig_a, this_mux_idx, -1));
 
+		// push before the y port scan so self-conflicts can be reported too
+		mux2info.push_back(muxinfo);
+
 		for (int idx : sig2bits(sig_y)) {
 			if (bit2info[idx].mux_driver)
 				log_cmd_error("Cell %s Y port signal %s already driven by %s\n", cell->name, log_signal(sig_y), mux2info[*bit2info[idx].mux_driver].cell->name);
@@ -152,8 +155,6 @@ struct OptMuxtreeWorker
 
 		for (int idx : sig2bits(sig_s))
 			bit2info[idx].seen_non_mux = true;
-
-		mux2info.push_back(muxinfo);
 	}
 
 	void see_non_mux_cell(Cell* cell) {
diff --git a/tests/gen_tests_makefile.py b/tests/gen_tests_makefile.py
index 13bb806c9..2950b8196 100644
--- a/tests/gen_tests_makefile.py
+++ b/tests/gen_tests_makefile.py
@@ -135,7 +135,7 @@ def generate_custom(callback, extra=None):
             callback()
 
 def generate_autotest_file(test_file, commands):
-    cmd = f"../tools/autotest.sh -G -j ${{SEEDOPT}} -Y ${{YOSYS}} ${{EXTRA_FLAGS}} {test_file}; \\\n{commands}"
+    cmd = f"../tools/autotest.sh -G -j ${{SEEDOPT}} -Y ${{YOSYS}} ${{EXTRA_FLAGS}} {test_file} || exit $$?; \\\n{commands}"
     generate_target(test_file, cmd)
 
 def generate_autotest(pattern, extra_flags, cmds=""):
diff --git a/tests/memories/wide_all.v b/tests/memories/wide_all.v
index f7bc3e5ce..1516b26fd 100644
--- a/tests/memories/wide_all.v
+++ b/tests/memories/wide_all.v
@@ -14,7 +14,7 @@ module test(
 reg [7:0] mem[3:254];
 
 assign rd[7:0] = mem[{ra, 1'b0}];
-assign rd[15:0] = mem[{ra, 1'b1}];
+assign rd[15:8] = mem[{ra, 1'b1}];
 
 initial begin
 	mem[5] = 8'h12;