diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs
index e9f844386..0a8b6a98d 100644
--- a/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs
@@ -65,7 +65,10 @@ public Task<Unit> Handle(DidChangeTextDocumentParams notification, CancellationT
 #pragma warning disable CS4014
             // Kick off script diagnostics without blocking the response
             // TODO: Get all recently edited files in the workspace
-            _analysisService.RunScriptDiagnosticsAsync(new ScriptFile[] { changedFile });
+            if (_analysisService != null)
+            {
+                _analysisService.RunScriptDiagnosticsAsync(new ScriptFile[] { changedFile });
+            }
 #pragma warning restore CS4014
             return Unit.Task;
         }
@@ -94,7 +97,10 @@ public Task<Unit> Handle(DidOpenTextDocumentParams notification, CancellationTok
 #pragma warning disable CS4014
             // Kick off script diagnostics without blocking the response
             // TODO: Get all recently edited files in the workspace
-            _analysisService.RunScriptDiagnosticsAsync(new ScriptFile[] { openedFile });
+            if (_analysisService != null)
+            {
+                _analysisService.RunScriptDiagnosticsAsync(new ScriptFile[] { openedFile });
+            }
 #pragma warning restore CS4014
 
             _logger.LogTrace("Finished opening document.");
@@ -117,7 +123,10 @@ public Task<Unit> Handle(DidCloseTextDocumentParams notification, CancellationTo
             if (fileToClose != null)
             {
                 _workspaceService.CloseFile(fileToClose);
-                _analysisService.ClearMarkers(fileToClose);
+                if (_analysisService != null)
+                {
+                    _analysisService.ClearMarkers(fileToClose);
+                }
             }
 
             _logger.LogTrace("Finished closing document.");