diff --git a/internal/app/app.go b/internal/app/app.go
index 654cb87ca643530eb030195f5b45679ee18af8e6..ce739991b2cdfc5132f92f4ab8eb3509a109df53 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -160,8 +160,12 @@ func (app *App) RunNonInteractive(ctx context.Context, prompt string, quiet bool
 				return fmt.Errorf("agent processing failed: %w", result.Error)
 			}
 
-			part := result.Message.Content().String()[readBts:]
-			fmt.Println(part)
+			msgContent := result.Message.Content().String()
+			if len(msgContent) < readBts {
+				// XXX: Log accordingly?
+				return fmt.Errorf("message content is shorter than read bytes: %d < %d", len(msgContent), readBts)
+			}
+			fmt.Println(msgContent[readBts:])
 
 			slog.Info("Non-interactive run completed", "session_id", sess.ID)
 			return nil