@@ -1,4 +1,6 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
 
 namespace Python.Test
 {
@@ -54,6 +56,13 @@ public static bool ThrowException()
             throw new OverflowException("error");
         }
 
+        public static IEnumerable<int> ThrowExceptionInIterator()
+        {
+            yield return 1;
+            yield return 2;
+            throw new OverflowException("error");
+        }
+
         public static void ThrowChainedExceptions()
         {
             try
 
@@ -345,3 +345,17 @@ def test_chained_exceptions():
         assert exc.Message == msg
         assert exc.__cause__ == exc.InnerException
         exc = exc.__cause__
+
+def test_iteration_exception():
+    from Python.Test import ExceptionTest
+    from System import OverflowException
+
+    val = ExceptionTest.ThrowExceptionInIterator().__iter__()
+    assert next(val) == 1
+    assert next(val) == 2
+    with pytest.raises(OverflowException) as cm:
+        next(val)
+
+    exc = cm.value 
+
+    assert isinstance(exc, OverflowException)
Original file line number	Diff line number	Diff line change
@@ -1,4 +1,6 @@
1	1	using System;
	2	+ using System.Collections;
	3	+ using System.Collections.Generic;
2	4
3	5	namespace Python.Test
4	6	{
@@ -54,6 +56,13 @@ public static bool ThrowException()
54	56	throw new OverflowException("error");
55	57	}
56	58
	59	+ public static IEnumerable<int> ThrowExceptionInIterator()
	60	+ {
	61	+ yield return 1;
	62	+ yield return 2;
	63	+ throw new OverflowException("error");
	64	+ }
	65	+
57	66	public static void ThrowChainedExceptions()
58	67	{
59	68	try