diff --git a/quickjs.c b/quickjs.c
index bf79ba417..f3a875e7f 100644
--- a/quickjs.c
+++ b/quickjs.c
@@ -43468,10 +43468,12 @@ static JSValue js_iterator_concat_next(JSContext *ctx, JSValueConst this_val,
         return JS_EXCEPTION;
     if (it->running)
         return JS_ThrowTypeError(ctx, "already running");
+    it->running = true;
 next:
     if (it->index >= it->count) {
         *pdone = true;
-        return JS_UNDEFINED;
+        val = JS_UNDEFINED;
+        goto done;
     }
     obj = &it->values[it->index + 0];
     meth = &it->values[it->index + 1];
@@ -43479,31 +43481,30 @@ static JSValue js_iterator_concat_next(JSContext *ctx, JSValueConst this_val,
     if (JS_IsUndefined(iter)) {
         iter = JS_GetIterator2(ctx, *obj, *meth);
         if (JS_IsException(iter))
-            return JS_EXCEPTION;
+            goto fail;
         it->iter = iter;
     }
     next = it->next;
     if (JS_IsUndefined(next)) {
         next = JS_GetProperty(ctx, iter, JS_ATOM_next);
         if (JS_IsException(next))
-            return JS_EXCEPTION;
+            goto fail;
         it->next = next;
     }
-    it->running = true;
     item = JS_IteratorNext2(ctx, iter, next, 0, NULL, &done);
-    it->running = false;
     if (JS_IsException(item))
-        return JS_EXCEPTION;
+        goto fail;
     if (!done) {
         *pdone = false;
-        return item;
+        val = item;
+        goto done;
     }
     // done==1 means really done, done==2 means "unknown, inspect object"
     if (done == 2) {
         val = JS_GetProperty(ctx, item, JS_ATOM_done);
         if (JS_IsException(val)) {
             JS_FreeValue(ctx, item);
-            return JS_EXCEPTION;
+            goto fail;
         }
         done = JS_ToBoolFree(ctx, val);
     }
@@ -43521,7 +43522,12 @@ static JSValue js_iterator_concat_next(JSContext *ctx, JSValueConst this_val,
     val = JS_GetProperty(ctx, item, JS_ATOM_value);
     JS_FreeValue(ctx, item);
     *pdone = false;
+done:
+    it->running = false;
     return val;
+fail:
+    val = JS_EXCEPTION;
+    goto done;
 }
 
 static JSValue js_iterator_concat_return(JSContext *ctx, JSValueConst this_val,
diff --git a/tests/bug1368.js b/tests/bug1368.js
index 5e82e63af..a9a7c32e2 100644
--- a/tests/bug1368.js
+++ b/tests/bug1368.js
@@ -1,9 +1,72 @@
-let it;
-const evil = {
-  [Symbol.iterator]() {
-    it.return();
-    return [][Symbol.iterator]();
-  }
-};
-it = Iterator.concat(evil);
-it.next();
+import { assert, assertThrows } from "./assert.js";
+
+function test_symbol_iterator_reentry() {
+  let it;
+  let calls = 0;
+  const evil = {
+    [Symbol.iterator]() {
+      calls++;
+      assertThrows(TypeError, () => it.return());
+      return [][Symbol.iterator]();
+    },
+  };
+
+  it = Iterator.concat(evil);
+  const result = it.next();
+  assert(calls, 1);
+  assert(result.done, true);
+  assert(result.value, undefined);
+}
+
+function test_next_getter_reentry() {
+  let it;
+  let calls = 0;
+  const evil = {
+    [Symbol.iterator]() {
+      return {
+        get next() {
+          calls++;
+          assertThrows(TypeError, () => it.return());
+          return () => ({ done: true, value: 1 });
+        },
+      };
+    },
+  };
+
+  it = Iterator.concat(evil);
+  const result = it.next();
+  assert(calls, 1);
+  assert(result.done, true);
+  assert(result.value, undefined);
+}
+
+function test_value_getter_reentry() {
+  let it;
+  let calls = 0;
+  const evil = {
+    [Symbol.iterator]() {
+      return {
+        next() {
+          return {
+            done: false,
+            get value() {
+              calls++;
+              assertThrows(TypeError, () => it.return());
+              return 1;
+            },
+          };
+        },
+      };
+    },
+  };
+
+  it = Iterator.concat(evil);
+  const result = it.next();
+  assert(calls, 1);
+  assert(result.done, false);
+  assert(result.value, 1);
+}
+
+test_symbol_iterator_reentry();
+test_next_getter_reentry();
+test_value_getter_reentry();