fixed wait_addr to exit immediately on exception