diff -r 90bb32c9921c Objects/genobject.c
--- a/Objects/genobject.c	Sat Aug 20 08:27:06 2016 +0000
+++ b/Objects/genobject.c	Sat Aug 20 11:42:40 2016 +0200
@@ -70,7 +70,10 @@
         return;                     /* resurrected.  :( */
 
     _PyObject_GC_UNTRACK(self);
-    Py_CLEAR(gen->gi_frame);
+    if (gen->gi_frame != NULL) {
+        gen->gi_frame->f_gen = NULL;
+        Py_CLEAR(gen->gi_frame);
+    }
     Py_CLEAR(gen->gi_code);
     Py_CLEAR(gen->gi_name);
     Py_CLEAR(gen->gi_qualname);