diff --git a/src/features/background-agent/session-todo-checker.ts b/src/features/background-agent/session-todo-checker.ts
index 3feaedbf..c1bad337 100644
--- a/src/features/background-agent/session-todo-checker.ts
+++ b/src/features/background-agent/session-todo-checker.ts
@@ -4,7 +4,7 @@ function isTodo(value: unknown): value is Todo {
   if (typeof value !== "object" || value === null) return false
   const todo = value as Record<string, unknown>
   return (
-    typeof todo["id"] === "string" &&
+    (typeof todo["id"] === "string" || todo["id"] === undefined) &&
     typeof todo["content"] === "string" &&
     typeof todo["status"] === "string" &&
     typeof todo["priority"] === "string"
diff --git a/src/hooks/anthropic-context-window-limit-recovery/empty-content-recovery-sdk.ts b/src/hooks/anthropic-context-window-limit-recovery/empty-content-recovery-sdk.ts
index a2260a93..c9ba7ed6 100644
--- a/src/hooks/anthropic-context-window-limit-recovery/empty-content-recovery-sdk.ts
+++ b/src/hooks/anthropic-context-window-limit-recovery/empty-content-recovery-sdk.ts
@@ -32,7 +32,7 @@ function messageHasContentFromSDK(message: SDKMessage): boolean {
 
     if (TOOL_TYPES.has(type)) return true
 
-    return true
+    continue
   }
 
   return false
diff --git a/src/hooks/session-recovery/recover-empty-content-message-sdk.ts b/src/hooks/session-recovery/recover-empty-content-message-sdk.ts
index e40b1b8f..e8be862a 100644
--- a/src/hooks/session-recovery/recover-empty-content-message-sdk.ts
+++ b/src/hooks/session-recovery/recover-empty-content-message-sdk.ts
@@ -133,8 +133,12 @@ function sdkMessageHasContent(message: MessageData): boolean {
 }
 
 async function readMessagesFromSDK(client: Client, sessionID: string): Promise<MessageData[]> {
-  const response = await client.session.messages({ path: { id: sessionID } })
-  return (response.data ?? []) as MessageData[]
+  try {
+    const response = await client.session.messages({ path: { id: sessionID } })
+    return (response.data ?? []) as MessageData[]
+  } catch {
+    return []
+  }
 }
 
 function findMessagesWithThinkingOnlyFromSDK(messages: MessageData[]): string[] {