diff --git a/src/api/core/logging/env-config.ts b/src/api/core/logging/env-config.ts
index 1163085ea6..af0d619cc7 100644
--- a/src/api/core/logging/env-config.ts
+++ b/src/api/core/logging/env-config.ts
@@ -89,20 +89,18 @@ function getEnvLocalValues(): Record<string, string> {
  * Check if API logging is enabled
  *
  * Checks in order:
- * 1. Workspace .env.local: ROO_CODE_API_LOGGING=true or ROO_CODE_LOGGING=true (for user's workspace)
+ * 1. Workspace .env.local: ROO_CODE_API_LOGGING=true (for user's workspace)
  * 2. Process env (loaded from extension's .env.local via envFile in launch.json)
- *
- * Note: Both ROO_CODE_API_LOGGING and ROO_CODE_LOGGING are accepted for backward compatibility
  */
 export function isLoggingEnabled(): boolean {
 	// Check workspace .env.local first (user's current workspace)
 	const envLocal = getEnvLocalValues()
-	if (envLocal["ROO_CODE_API_LOGGING"] === "true" || envLocal["ROO_CODE_LOGGING"] === "true") {
+	if (envLocal["ROO_CODE_API_LOGGING"] === "true") {
 		return true
 	}
 
 	// Fallback to process.env (populated from extension's .env.local via launch.json envFile)
-	return process.env.ROO_CODE_API_LOGGING === "true" || process.env.ROO_CODE_LOGGING === "true"
+	return process.env.ROO_CODE_API_LOGGING === "true"
 }
 
 /**
diff --git a/src/api/core/logging/http-interceptor.ts b/src/api/core/logging/http-interceptor.ts
index 813eeecd40..4aaa5fac8f 100644
--- a/src/api/core/logging/http-interceptor.ts
+++ b/src/api/core/logging/http-interceptor.ts
@@ -120,7 +120,7 @@ export function createLoggingFetch(providerName: string): typeof fetch {
 				method,
 				url,
 				headers: sanitizeHeaders(headers),
-				body: init?.body ? parseBodyIfJson(init.body) : undefined,
+				body: init?.body === undefined || init.body === null ? undefined : parseBodyIfJson(init.body),
 			})
 		}
 
diff --git a/src/api/providers/claude-code.ts b/src/api/providers/claude-code.ts
index 293bcf2bee..728b997d36 100644
--- a/src/api/providers/claude-code.ts
+++ b/src/api/providers/claude-code.ts
@@ -407,11 +407,9 @@ export class ClaudeCodeHandler implements ApiHandler, SingleCompletionHandler {
 
 			return result
 		} catch (error) {
-			if (!(error instanceof Error && error.message)) {
-				ApiLogger.logError(requestId, context, {
-					message: error instanceof Error ? error.message : String(error),
-				})
-			}
+			ApiLogger.logError(requestId, context, {
+				message: error instanceof Error ? error.message : String(error),
+			})
 			throw error
 		}
 	}