diff --git a/sarif/src/main/java/com/jetbrains/qodana/sarif/baseline/DescriptorLookup.java b/sarif/src/main/java/com/jetbrains/qodana/sarif/baseline/DescriptorLookup.java
index ccabdea..fb6c87f 100644
--- a/sarif/src/main/java/com/jetbrains/qodana/sarif/baseline/DescriptorLookup.java
+++ b/sarif/src/main/java/com/jetbrains/qodana/sarif/baseline/DescriptorLookup.java
@@ -36,7 +36,7 @@ private Stream<DescriptorWithLocation> descriptors(Run run) {
                 })
                 .orElseGet(Stream::empty);
 
-        Stream<DescriptorWithLocation> extRules = Optional.of(run.getTool())
+        Stream<DescriptorWithLocation> extRules = Optional.ofNullable(run.getTool())
                 .map(Tool::getExtensions)
                 .orElseGet(HashSet::new)
                 .stream()