diff --git a/Repl.lean b/Repl.lean
index 0518296..3c87429 100644
--- a/Repl.lean
+++ b/Repl.lean
@@ -18,8 +18,9 @@ structure State where
   -- Parser state
   scope : Elab.Command.Scope := { header := "" }
 
-/-- Main state monad for executing commands -/
+/-- Main monad for executing commands -/
 abbrev MainM := ReaderT Context $ StateRefT State IO
+/-- Main with possible exception -/
 abbrev EMainM := Protocol.FallibleT $ ReaderT Context $ StateRefT State IO
 def getMainState : MainM State := get
 
@@ -54,13 +55,17 @@ def runCoreM { α } (coreM : CoreM α) : EMainM α := do
   }
   -- Remap the coreM to capture every exception
   let coreM' : CoreM _ :=
-    Core.tryCatchRuntimeEx (Except.ok <$> coreM) λ ex => do
+    try
+      Except.ok <$> coreM
+    catch ex =>
       let desc ← ex.toMessageData.toString
       return Except.error $ ({ error := "exception", desc } : Protocol.InteractionError)
-  let io := coreM'.toIO coreCtx coreState
   if let .some token := cancelTk? then
     runCancelTokenWithTimeout token (timeout := .mk options.timeout)
-  let (result, state') ← io
+  let (result, state') ← match ← (coreM'.run coreCtx coreState).toIO' with
+    | Except.error (Exception.error _ msg)   => Protocol.throw $ { error := "core", desc := ← msg.toString }
+    | Except.error (Exception.internal id _) => Protocol.throw $ { error := "internal", desc := (← id.getName).toString }
+    | Except.ok a                            => pure a
   if result matches .ok _ then
     modifyEnv λ _ => state'.env
   liftExcept result
diff --git a/Test/Integration.lean b/Test/Integration.lean
index 2c59e3b..013554b 100644
--- a/Test/Integration.lean
+++ b/Test/Integration.lean
@@ -101,7 +101,7 @@ def test_tactic_timeout : Test :=
     step "options.set" ({ timeout? := .some 10 } : Protocol.OptionsSet)
      ({ }: Protocol.OptionsSetResult),
     step "goal.tactic" ({ stateId := 0, expr? := .some "by\nsleep 1000; simp" }: Protocol.GoalTactic)
-     ({ error := "io", desc := "internal exception #6" }: Protocol.InteractionError),
+     ({ error := "internal", desc := "interrupt" }: Protocol.InteractionError),
     -- ensure graceful recovery
     step "options.set" ({ timeout? := .some 0 } : Protocol.OptionsSet)
      ({ }: Protocol.OptionsSetResult),