diff --git a/packages/core/src/code_assist/converter.ts b/packages/core/src/code_assist/converter.ts
index c077aa39bb..f9c03a2520 100644
--- a/packages/core/src/code_assist/converter.ts
+++ b/packages/core/src/code_assist/converter.ts
@@ -137,18 +137,14 @@ export function toGenerateContentRequest(
 export function fromGenerateContentResponse(
   res: CaGenerateContentResponse,
 ): GenerateContentResponse {
-  const out = new GenerateContentResponse();
-  out.responseId = res.traceId;
   const inres = res.response;
-  if (!inres) {
-    out.candidates = [];
-    return out;
-  }
-  out.candidates = inres.candidates ?? [];
+  const out = new GenerateContentResponse();
+  out.candidates = inres.candidates;
   out.automaticFunctionCallingHistory = inres.automaticFunctionCallingHistory;
   out.promptFeedback = inres.promptFeedback;
   out.usageMetadata = inres.usageMetadata;
   out.modelVersion = inres.modelVersion;
+  out.responseId = res.traceId;
   return out;
 }
 
diff --git a/packages/core/src/code_assist/server.ts b/packages/core/src/code_assist/server.ts
index 1d02840c04..3cddf2369f 100644
--- a/packages/core/src/code_assist/server.ts
+++ b/packages/core/src/code_assist/server.ts
@@ -65,7 +65,7 @@ import {
   recordConversationOffered,
 } from './telemetry.js';
 import { getClientMetadata } from './experiments/client_metadata.js';
-import { debugLogger } from 'src/utils/debugLogger.js';
+import { debugLogger } from '../utils/debugLogger.js';
 /** HTTP options to be used in each of the requests. */
 export interface HttpOptions {
   /** Additional HTTP headers to be sent with the request. */