diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f31b3ee5a5..aced311bc0 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -110,17 +110,10 @@ PyRun_InteractiveLoopFlags(FILE *fp, const char *filename_str, PyCompilerFlags *
         Py_XDECREF(v);
     }
     err = -1;
-    for (;;) {
+    for (ret=0; ret != -1 && ret != E_EOF; ) {
         ret = PyRun_InteractiveOneObject(fp, filename, flags);
         _PY_DEBUG_PRINT_TOTAL_REFS();
-        if (ret == E_EOF) {
-            err = 0;
-            break;
-        }
-        /*
-        if (ret == E_NOMEM)
-            break;
-        */
+        err = (ret == E_EOF) ? 0 : err;
     }
     Py_DECREF(filename);
     return err;