diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalSession.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalSession.kt
index 1f4927168d42..f935c1478e1a 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalSession.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalSession.kt
@@ -64,7 +64,12 @@ class BlockTerminalSession(settings: JBTerminalSystemSettingsProviderBase,
       finally {
         ttyConnector.closeSafely()
         for (terminationListener in terminationListeners) {
-          terminationListener.run()
+          try {
+            terminationListener.run()
+          }
+          catch (t: Throwable) {
+            thisLogger().error("Unhandled exception in termination listener", t)
+          }
         }
       }
     }