oracle
diff --git a/‎graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
Lines changed: 2 additions & 0 deletions b/‎graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
Lines changed: 2 additions & 0 deletions
diff --git a/‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/exception/TopLevelExceptionHandler.java
Lines changed: 21 additions & 16 deletions b/‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/exception/TopLevelExceptionHandler.java
Lines changed: 21 additions & 16 deletions
@@ -843,6 +843,8 @@ protected void launch(Builder contextBuilder) {
                 } catch (PolyglotException e) {
                     if (e.isExit()) {
                         rc = e.getExitStatus();
+                    } else {
+                        throw e;
                     }
                 } catch (NoSuchFileException e) {
                     printFileNotFoundException(e);
 
@@ -195,12 +195,7 @@ private AbstractTruffleException handlePythonException(AbstractTruffleException
             if (PythonOptions.isPExceptionWithJavaStacktrace(getPythonLanguage()) && e instanceof PException pe) {
                 ExceptionUtils.printJavaStackTrace(pe);
             }
-            if (!getSourceSection().getSource().isInteractive()) {
-                if (getContext().isChildContext()) {
-                    getContext().getChildContextData().setExitCode(1);
-                }
-                throw new PythonExitException(this, 1);
-            }
+            exit(1);
         }
         // Before we leave Python, format the message since outside the context
         if (e instanceof PException pe) {
@@ -209,6 +204,15 @@ private AbstractTruffleException handlePythonException(AbstractTruffleException
         throw e;
     }
 
+    private void exit(int exitCode) {
+        if (!getSourceSection().getSource().isInteractive()) {
+            if (getContext().isChildContext()) {
+                getContext().getChildContextData().setExitCode(1);
+            }
+            throw new PythonExitException(this, exitCode);
+        }
+    }
+
     private static boolean isSystemExit(PBaseException pythonException) {
         return IsBuiltinClassProfile.profileClassSlowPath(GetPythonObjectClassNode.executeUncached(pythonException), SystemExit);
     }
@@ -227,6 +231,7 @@ private void handleJavaException(Throwable e) {
                     if (PythonOptions.shouldPrintJavaStacktrace(getPythonLanguage(), e)) {
                         e.printStackTrace();
                     }
+                    exit(1);
                 }
             } catch (UnsupportedMessageException unsupportedMessageException) {
                 throw CompilerDirectives.shouldNotReachHere();
@@ -250,12 +255,12 @@ private void handleSystemExit(PBaseException pythonException) {
             int exitcode = getExitCode(pythonException);
             throw new PythonExitException(this, exitcode);
         } catch (CannotCastException e) {
-            // fall through
-        }
-        if (handleAlwaysRunExceptHook(theContext, pythonException)) {
-            throw new PythonExitException(this, 1);
+            if (handleAlwaysRunExceptHook(theContext, pythonException)) {
+                throw new PythonExitException(this, 1);
+            } else {
+                throw pythonException.getExceptionForReraise(pythonException.getTraceback());
+            }
         }
-        throw pythonException.getExceptionForReraise(pythonException.getTraceback());
     }
 
     @TruffleBoundary
@@ -264,12 +269,12 @@ private Object handleChildContextExit(PBaseException pythonException) throws PEx
         try {
             return getExitCode(pythonException);
         } catch (CannotCastException cce) {
-            // fall through
-        }
-        if (handleAlwaysRunExceptHook(getContext(), pythonException)) {
-            return 1;
+            if (handleAlwaysRunExceptHook(getContext(), pythonException)) {
+                return 1;
+            } else {
+                throw pythonException.getExceptionForReraise(pythonException.getTraceback());
+            }
         }
-        throw pythonException.getExceptionForReraise(pythonException.getTraceback());
     }
 
     private static int getExitCode(PBaseException pythonException) throws CannotCastException {
Original file line number	Diff line number	Diff line change
`@@ -843,6 +843,8 @@ protected void launch(Builder contextBuilder) {`
`843`	`843`	`} catch (PolyglotException e) {`
`844`	`844`	`if (e.isExit()) {`
`845`	`845`	`rc = e.getExitStatus();`
	`846`	`+ } else {`
	`847`	`+ throw e;`
`846`	`848`	`}`
`847`	`849`	`} catch (NoSuchFileException e) {`
`848`	`850`	`printFileNotFoundException(e);`