diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs
index ebbb33b79..689b64b83 100644
--- a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs
+++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs
@@ -891,11 +891,23 @@ private static async Task DelayThenInvokeDiagnostics(
             // Get the requested files
             foreach (ScriptFile scriptFile in filesToAnalyze)
             {
-                Logger.Write(LogLevel.Verbose, "Analyzing script file: " + scriptFile.FilePath);
+                ScriptFileMarker[] semanticMarkers = null;
+                if (editorSession.AnalysisService != null)
+                {
+                    Logger.Write(LogLevel.Verbose, "Analyzing script file: " + scriptFile.FilePath);
 
-                var semanticMarkers =
-                    editorSession.AnalysisService.GetSemanticMarkers(
-                        scriptFile);
+                    semanticMarkers =
+                        editorSession.AnalysisService.GetSemanticMarkers(
+                            scriptFile);
+
+                    Logger.Write(LogLevel.Verbose, "Analysis complete.");
+                }
+                else
+                {
+                    // Semantic markers aren't available if the AnalysisService
+                    // isn't available
+                    semanticMarkers = new ScriptFileMarker[0];
+                }
 
                 var allMarkers = scriptFile.SyntaxMarkers.Concat(semanticMarkers);
 
@@ -904,8 +916,6 @@ await PublishScriptDiagnostics(
                     semanticMarkers,
                     eventContext);
             }
-
-            Logger.Write(LogLevel.Verbose, "Analysis complete.");
         }
 
         private static async Task PublishScriptDiagnostics(
diff --git a/src/PowerShellEditorServices/Session/EditorSession.cs b/src/PowerShellEditorServices/Session/EditorSession.cs
index 0af3da9de..463bac882 100644
--- a/src/PowerShellEditorServices/Session/EditorSession.cs
+++ b/src/PowerShellEditorServices/Session/EditorSession.cs
@@ -4,6 +4,8 @@
 //
 
 using Microsoft.PowerShell.EditorServices.Console;
+using Microsoft.PowerShell.EditorServices.Utility;
+using System.IO;
 using System.Management.Automation;
 using System.Management.Automation.Runspaces;
 using System.Threading;
@@ -64,9 +66,21 @@ public void StartSession()
             // Initialize all services
             this.PowerShellContext = new PowerShellContext();
             this.LanguageService = new LanguageService(this.PowerShellContext);
-            this.AnalysisService = new AnalysisService();
             this.DebugService = new DebugService(this.PowerShellContext);
             this.ConsoleService = new ConsoleService(this.PowerShellContext);
+
+            // AnalysisService will throw FileNotFoundException if
+            // Script Analyzer binaries are not included.
+            try
+            {
+                this.AnalysisService = new AnalysisService();
+            }
+            catch (FileNotFoundException)
+            {
+                Logger.Write(
+                    LogLevel.Warning,
+                    "Script Analyzer binaries not found, AnalysisService will be disabled.");
+            }
         }
 
         #endregion