diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyCheckingService.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyCheckingService.cs
index 8603e3bd7c7a966bc72025dafdab64449a1d43fb..07211453d24e98295888c88ea3a62a5041b6c006 100644
--- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyCheckingService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyCheckingService.cs
@@ -26,7 +26,7 @@ internal sealed class AnalyzerDependencyCheckingService
         private readonly BindingRedirectionService _bindingRedirectionService;
 
         private CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
-        private Task<AnalyzerDependencyResults> _task = Task.FromResult((AnalyzerDependencyResults)null);
+        private Task<AnalyzerDependencyResults> _task = Task.FromResult(AnalyzerDependencyResults.Empty);
         private ImmutableHashSet<string> _analyzerPaths = ImmutableHashSet.Create<string>(StringComparer.OrdinalIgnoreCase);
 
         [ImportingConstructor]
@@ -46,7 +46,7 @@ public async void CheckForConflictsAsync()
             {
                 results = await GetConflictsAsync().ConfigureAwait(continueOnCapturedContext: true);
             }
-            catch (OperationCanceledException)
+            catch
             {
                 return;
             }
diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyResults.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyResults.cs
index e89749ce58a8556d37138aad6ea1f1e6725932eb..48ab6ed4ebcb21472710129c3d9dfbc5d25cf842 100644
--- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyResults.cs
+++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyResults.cs
@@ -7,6 +7,8 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation
 {
     internal sealed class AnalyzerDependencyResults
     {
+        public static readonly AnalyzerDependencyResults Empty = new AnalyzerDependencyResults(ImmutableArray<AnalyzerDependencyConflict>.Empty, ImmutableArray<MissingAnalyzerDependency>.Empty);
+
         public AnalyzerDependencyResults(ImmutableArray<AnalyzerDependencyConflict> conflicts, ImmutableArray<MissingAnalyzerDependency> missingDependencies)
         {
             Debug.Assert(conflicts != default(ImmutableArray<AnalyzerDependencyConflict>));