diff --git a/src/coverlet.core/Helpers/SourceRootTranslator.cs b/src/coverlet.core/Helpers/SourceRootTranslator.cs
index 9694a6a..9c76518 100644
--- a/src/coverlet.core/Helpers/SourceRootTranslator.cs
+++ b/src/coverlet.core/Helpers/SourceRootTranslator.cs
@@ -40,7 +40,7 @@ namespace Coverlet.Core.Helpers
             {
                 throw new FileNotFoundException("Module test path not found", moduleTestPath);
             }
-            _sourceRootMapping = LoadSourceRootMapping(Path.GetDirectoryName(moduleTestPath)) ?? new Dictionary<string, List<SourceRootMapping>>();
+            _sourceRootMapping = LoadSourceRootMapping(Path.GetDirectoryName(moduleTestPath));
         }
 
         private Dictionary<string, List<SourceRootMapping>> LoadSourceRootMapping(string directory)
diff --git a/src/coverlet.core/Symbols/CecilSymbolHelper.cs b/src/coverlet.core/Symbols/CecilSymbolHelper.cs
index 19069bf..42df090 100644
--- a/src/coverlet.core/Symbols/CecilSymbolHelper.cs
+++ b/src/coverlet.core/Symbols/CecilSymbolHelper.cs
@@ -728,7 +728,7 @@ namespace Coverlet.Core.Symbols
                 Instruction startFilter = exceptionHandler.FilterStart;
                 Instruction endFilter = startFilter;
 
-                while (endFilter.OpCode != OpCodes.Endfilter && endFilter != null)
+                while (endFilter != null && endFilter.OpCode != OpCodes.Endfilter)
                 {
                     endFilter = endFilter.Next;
                 }