diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 659892b17f7..075d985dbd7 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -1229,7 +1229,7 @@ function AssistantMessage(props: { message: AssistantMessage; parts: Part[]; las
           customBorderChars={SplitBorder.customBorderChars}
           borderColor={theme.error}
         >
-          <text fg={theme.textMuted}>{props.message.error?.data.message}</text>
+          <text fg={theme.textMuted}>{props.message.error?.data?.message ?? ""}</text>
         </box>
       </Show>
       <Switch>
@@ -1814,7 +1814,7 @@ function Patch(props: ToolProps<typeof PatchTool>) {
       <Match when={props.output !== undefined}>
         <BlockTool title="# Patch" part={props.part}>
           <box>
-            <text fg={theme.text}>{props.output?.trim()}</text>
+            <text fg={theme.text}>{props.output!.trim()}</text>
           </box>
         </BlockTool>
       </Match>