diff --git a/desktop/doctor/src/index.tsx b/desktop/doctor/src/index.tsx
index b2f353d64..6e71aa736 100644
--- a/desktop/doctor/src/index.tsx
+++ b/desktop/doctor/src/index.tsx
@@ -183,7 +183,7 @@ export function getHealthchecks(): FlipperDoctor.Healthchecks {
                       message: `Xcode version is not selected. You can select it using command "sudo xcode-select -switch <path/to/>Xcode.app". ${result.message}.`,
                     };
                   }
-                  const selectedXcode = result.stdout!.toString().trim();
+                  const selectedXcode = result.stdout.toString().trim();
                   if (selectedXcode == '/Library/Developer/CommandLineTools') {
                     return {
                       hasProblem: true,
diff --git a/desktop/flipper-common/src/doctor.tsx b/desktop/flipper-common/src/doctor.tsx
index aabb07728..909d281ec 100644
--- a/desktop/flipper-common/src/doctor.tsx
+++ b/desktop/flipper-common/src/doctor.tsx
@@ -69,9 +69,14 @@ export namespace FlipperDoctor {
     message: string;
   };
 
-  export type SubprocessHealtcheckRunResult = HealthcheckRunResult & {
-    stdout?: string;
-  };
+  export type SubprocessHealtcheckRunResult =
+    | (HealthcheckRunResult & {
+        hasProblem: true;
+      })
+    | (HealthcheckRunResult & {
+        hasProblem: false;
+        stdout: string;
+      });
 
   export type CategoryResult = [
     string,