diff --git a/packages/agent/src/server/agent-server.ts b/packages/agent/src/server/agent-server.ts
index ef1be6a671..87bfb8097b 100644
--- a/packages/agent/src/server/agent-server.ts
+++ b/packages/agent/src/server/agent-server.ts
@@ -1387,7 +1387,10 @@ export class AgentServer {
     });
 
     this.sessionReadyBootMs = Math.round(process.uptime() * 1000);
-    this.sessionInitMs = Math.max(0, Date.now() - this.barrierReleasedAtMs!);
+    this.sessionInitMs = Math.max(
+      0,
+      Date.now() - (this.barrierReleasedAtMs ?? Date.now()),
+    );
     this.logger.debug("Session initialized successfully", {
       bootMs: this.sessionReadyBootMs,
       sessionInitMs: this.sessionInitMs,
diff --git a/packages/workspace-server/src/services/skills/skills.ts b/packages/workspace-server/src/services/skills/skills.ts
index ae90f727bb..9f5db65f0a 100644
--- a/packages/workspace-server/src/services/skills/skills.ts
+++ b/packages/workspace-server/src/services/skills/skills.ts
@@ -538,7 +538,8 @@ export class SkillsService {
     const MAX_RESOLVED_SKILLS = 50;
 
     while (queue.length > 0) {
-      const ref = queue.shift()!;
+      const ref = queue.shift();
+      if (!ref) break;
       const key = `${ref.source}:${ref.path}`;
       if (seen.has(key)) continue;
       if (resolved.length >= MAX_RESOLVED_SKILLS) {