diff --git a/src/apexguru/apex-guru-service.ts b/src/apexguru/apex-guru-service.ts
index b8bea13..e4fb791 100644
--- a/src/apexguru/apex-guru-service.ts
+++ b/src/apexguru/apex-guru-service.ts
@@ -128,8 +128,8 @@ export function transformStringToRuleResult(fileName: string, jsonString: string
     };
 
 	reports.forEach(parsed => {
-		const encodedCodeBefore = parsed.properties.find((prop: ApexGuruProperty) => prop.name === 'code_before')?.value ?? '';
-		const encodedCodeAfter = parsed.properties.find((prop: ApexGuruProperty) => prop.name === 'code_after')?.value ?? '';
+		const encodedCodeBefore = parsed.properties.find((prop: ApexGuruProperty) => prop.name === 'code_before')?.value;
+		const encodedCodeAfter = parsed.properties.find((prop: ApexGuruProperty) => prop.name === 'code_after')?.value;
 		const lineNumber = parseInt(parsed.properties.find((prop: ApexGuruProperty) => prop.name === 'line_number')?.value);
 
 		const violation: ApexGuruViolation = {
@@ -139,8 +139,8 @@ export function transformStringToRuleResult(fileName: string, jsonString: string
 			category: parsed.type, // Replace with actual category if available
 			line: lineNumber,
 			column: 1,
-			currentCode: Buffer.from(encodedCodeBefore, 'base64').toString('utf8'),
-			suggestedCode: Buffer.from(encodedCodeAfter, 'base64').toString('utf8'),
+			currentCode: encodedCodeBefore ? Buffer.from(encodedCodeBefore, 'base64').toString('utf8') : encodedCodeBefore,
+			suggestedCode: encodedCodeAfter ? Buffer.from(encodedCodeAfter, 'base64').toString('utf8') : encodedCodeAfter,
 		};
 	
 		ruleResult.violations.push(violation);
diff --git a/src/lib/diagnostics.ts b/src/lib/diagnostics.ts
index 0af8611..ab033ff 100644
--- a/src/lib/diagnostics.ts
+++ b/src/lib/diagnostics.ts
@@ -92,7 +92,7 @@ export class DiagnosticManager {
         if (engine === 'apexguru') {
             const apexGuruViolation = violation as ApexGuruViolation;
         
-            if (apexGuruViolation.suggestedCode) {
+            if (apexGuruViolation.suggestedCode !== undefined) {
                 diagnostic.relatedInformation = [
                     new vscode.DiagnosticRelatedInformation(
                         new vscode.Location(vscode.Uri.parse('Current Code'), range),
diff --git a/src/test/suite/apexguru/apex-guru-service.test.ts b/src/test/suite/apexguru/apex-guru-service.test.ts
index 770274a..c83471b 100644
--- a/src/test/suite/apexguru/apex-guru-service.test.ts
+++ b/src/test/suite/apexguru/apex-guru-service.test.ts
@@ -176,7 +176,7 @@ suite('Apex Guru Test Suite', () => {
                   category: 'BestPractices',
                   line: 10,
                   column: 1,
-                  currentCode: '',
+                  currentCode: undefined,
                   suggestedCode: 'System.out.println("Hello World");'
               }]
           });