diff --git a/qemu/cpu-exec.c b/qemu/cpu-exec.c
index 1e26e1b9..b7460385 100644
--- a/qemu/cpu-exec.c
+++ b/qemu/cpu-exec.c
@@ -205,6 +205,8 @@ int cpu_exec(struct uc_struct *uc, CPUArchState *env)   // qq
                 have_tb_lock = true;
                 tb = tb_find_fast(env);	// qq
                 if (!tb) {   // invalid TB due to invalid code?
+                    uc->invalid_error = UC_ERR_CODE_INVALID;
+                    ret = EXCP_HLT;
                     break;
                 }
                 /* Note: we do it here to avoid a gcc bug on Mac OS X when
diff --git a/regress/jmp_ebx_hang.py b/regress/jmp_ebx_hang.py
index 1b78d89c..5683de89 100755
--- a/regress/jmp_ebx_hang.py
+++ b/regress/jmp_ebx_hang.py
@@ -4,20 +4,23 @@
 
 import unicorn
 CODE_ADDR = 0x10101000
-CODE = b'\xff\xe3'
+CODE = b'\xff\xe3'  # jmp ebx
 mu = unicorn.Uc(unicorn.UC_ARCH_X86, unicorn.UC_MODE_32)
 mu.mem_map(CODE_ADDR, 1024 * 4)
 mu.mem_write(CODE_ADDR, CODE)
 # If EBX is zero then an exception is raised, as expected
 mu.reg_write(unicorn.x86_const.UC_X86_REG_EBX, 0x0)
 
+print(">>> jmp ebx (ebx = 0)");
 try:
     mu.emu_start(CODE_ADDR, CODE_ADDR + 2, count=1)
 except unicorn.UcError as e:
+    print("ERROR: %s" % e)
     assert(e.errno == unicorn.UC_ERR_CODE_INVALID)
 else:
     assert(False)
 
+print(">>> jmp ebx (ebx = 0xaa96a47f)");
 mu = unicorn.Uc(unicorn.UC_ARCH_X86, unicorn.UC_MODE_32)
 mu.mem_map(CODE_ADDR, 1024 * 4)
 # If we write this address to EBX then the emulator hangs on emu_start
@@ -26,6 +29,7 @@ mu.mem_write(CODE_ADDR, CODE)
 try:
     mu.emu_start(CODE_ADDR, CODE_ADDR + 2, count=1)
 except unicorn.UcError as e:
+    print("ERROR: %s" % e)
     assert(e.errno == unicorn.UC_ERR_CODE_INVALID)
 else:
     assert(False)