diff --git a/src/PowerShellEditorServices/Session/PowerShellVersionDetails.cs b/src/PowerShellEditorServices/Session/PowerShellVersionDetails.cs
index 72c8ac0ce..8a3a54a4f 100644
--- a/src/PowerShellEditorServices/Session/PowerShellVersionDetails.cs
+++ b/src/PowerShellEditorServices/Session/PowerShellVersionDetails.cs
@@ -134,13 +134,16 @@ public static PowerShellVersionDetails GetVersionDetails(Runspace runspace)
                     }
 
                     var arch = PowerShellContext.ExecuteScriptAndGetItem<string>("$env:PROCESSOR_ARCHITECTURE", runspace);
-                    if (string.Equals(arch, "AMD64", StringComparison.CurrentCultureIgnoreCase))
+                    if (arch != null)
                     {
-                        architecture = PowerShellProcessArchitecture.X64;
-                    }
-                    else if (string.Equals(arch, "x86", StringComparison.CurrentCultureIgnoreCase))
-                    {
-                        architecture = PowerShellProcessArchitecture.X86;
+                        if (string.Equals(arch, "AMD64", StringComparison.CurrentCultureIgnoreCase))
+                        {
+                            architecture = PowerShellProcessArchitecture.X64;
+                        }
+                        else if (string.Equals(arch, "x86", StringComparison.CurrentCultureIgnoreCase))
+                        {
+                            architecture = PowerShellProcessArchitecture.X86;
+                        }
                     }
                 }
             }