1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/contextlib.py b/Lib/contextlib.py
index fba4889002..aeec40e1e3 100644
--- a/Lib/contextlib.py
+++ b/Lib/contextlib.py
@@ -25,6 +25,10 @@ class GeneratorContextManager(object):
             else:
                 raise RuntimeError("generator didn't stop")
         else:
+            if value is None:
+                # Need to force instantiation so we can reliably
+                # tell if we get the same exception back
+                value = type()
             try:
                 self.gen.throw(type, value, traceback)
                 raise RuntimeError("generator didn't stop after throw()")