diff -r 55c50c570098 Include/pyerrors.h
--- a/Include/pyerrors.h	Wed Jun 11 07:19:39 2014 +0300
+++ b/Include/pyerrors.h	Wed Jun 11 09:07:55 2014 +0300
@@ -123,7 +123,9 @@
 /* Context manipulation (PEP 3134) */
 PyAPI_FUNC(PyObject *) PyException_GetContext(PyObject *);
 PyAPI_FUNC(void) PyException_SetContext(PyObject *, PyObject *);
-
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
+#endif
 
 /* */
 
diff -r 55c50c570098 Modules/_io/_iomodule.c
--- a/Modules/_io/_iomodule.c	Wed Jun 11 07:19:39 2014 +0300
+++ b/Modules/_io/_iomodule.c	Wed Jun 11 09:07:55 2014 +0300
@@ -465,20 +465,11 @@
 
   error:
     if (result != NULL) {
-        PyObject *exc, *val, *tb;
+        PyObject *exc, *val, *tb, *res;
         PyErr_Fetch(&exc, &val, &tb);
-        if (_PyObject_CallMethodId(result, &PyId_close, NULL) != NULL)
-            PyErr_Restore(exc, val, tb);
-        else {
-            PyObject *exc2, *val2, *tb2;
-            PyErr_Fetch(&exc2, &val2, &tb2);
-            PyErr_NormalizeException(&exc, &val, &tb);
-            Py_XDECREF(exc);
-            Py_XDECREF(tb);
-            PyErr_NormalizeException(&exc2, &val2, &tb2);
-            PyException_SetContext(val2, val);
-            PyErr_Restore(exc2, val2, tb2);
-        }
+        res = _PyObject_CallMethodId(result, &PyId_close, NULL);
+        _PyErr_ChainExceptions(exc, val, tb);
+        Py_XDECREF(res);
         Py_DECREF(result);
     }
     Py_XDECREF(modeobj);
diff -r 55c50c570098 Modules/_io/bufferedio.c
--- a/Modules/_io/bufferedio.c	Wed Jun 11 07:19:39 2014 +0300
+++ b/Modules/_io/bufferedio.c	Wed Jun 11 09:07:55 2014 +0300
@@ -543,20 +543,8 @@
     }
 
     if (exc != NULL) {
-        if (res != NULL) {
-            Py_CLEAR(res);
-            PyErr_Restore(exc, val, tb);
-        }
-        else {
-            PyObject *exc2, *val2, *tb2;
-            PyErr_Fetch(&exc2, &val2, &tb2);
-            PyErr_NormalizeException(&exc, &val, &tb);
-            Py_DECREF(exc);
-            Py_XDECREF(tb);
-            PyErr_NormalizeException(&exc2, &val2, &tb2);
-            PyException_SetContext(val2, val);
-            PyErr_Restore(exc2, val2, tb2);
-        }
+        _PyErr_ChainExceptions(exc, val, tb);
+        Py_CLEAR(res);
     }
 
 end:
diff -r 55c50c570098 Modules/_io/textio.c
--- a/Modules/_io/textio.c	Wed Jun 11 07:19:39 2014 +0300
+++ b/Modules/_io/textio.c	Wed Jun 11 09:07:55 2014 +0300
@@ -2614,20 +2614,8 @@
 
         res = _PyObject_CallMethodId(self->buffer, &PyId_close, NULL);
         if (exc != NULL) {
-            if (res != NULL) {
-                Py_CLEAR(res);
-                PyErr_Restore(exc, val, tb);
-            }
-            else {
-                PyObject *exc2, *val2, *tb2;
-                PyErr_Fetch(&exc2, &val2, &tb2);
-                PyErr_NormalizeException(&exc, &val, &tb);
-                Py_DECREF(exc);
-                Py_XDECREF(tb);
-                PyErr_NormalizeException(&exc2, &val2, &tb2);
-                PyException_SetContext(val2, val);
-                PyErr_Restore(exc2, val2, tb2);
-            }
+            _PyErr_ChainExceptions(exc, val, tb);
+            Py_CLEAR(res);
         }
         return res;
     }
diff -r 55c50c570098 Python/errors.c
--- a/Python/errors.c	Wed Jun 11 07:19:39 2014 +0300
+++ b/Python/errors.c	Wed Jun 11 09:07:55 2014 +0300
@@ -384,6 +384,27 @@
     Py_XDECREF(oldtraceback);
 }
 
+void
+_PyErr_ChainExceptions(PyObject *exc, PyObject *val, PyObject *tb)
+{
+    if (exc == NULL)
+        return;
+
+    if (PyErr_Occurred()) {
+        PyObject *exc2, *val2, *tb2;
+        PyErr_Fetch(&exc2, &val2, &tb2);
+        PyErr_NormalizeException(&exc, &val, &tb);
+        Py_DECREF(exc);
+        Py_XDECREF(tb);
+        PyErr_NormalizeException(&exc2, &val2, &tb2);
+        PyException_SetContext(val2, val);
+        PyErr_Restore(exc2, val2, tb2);
+    }
+    else {
+        PyErr_Restore(exc, val, tb);
+    }
+}
+
 /* Convenience functions to set a type error exception and return 0 */
 
 int