diff --git a/platform/analysis-api/src/com/intellij/codeInspection/GlobalInspectionContext.java b/platform/analysis-api/src/com/intellij/codeInspection/GlobalInspectionContext.java
index 7d55386df5b7..98b1e20cb38f 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/GlobalInspectionContext.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/GlobalInspectionContext.java
@@ -26,6 +26,7 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnknownNullability;
 
 /**
  * The context for a global inspection run. Provides access to the reference graph
@@ -66,7 +67,7 @@ public interface GlobalInspectionContext extends UserDataHolder {
   @NotNull
   Project getProject();
 
-  <T> T getExtension(@NotNull Key<T> key);
+  <T> @UnknownNullability T getExtension(@NotNull Key<T> key);
 
   void incrementJobDoneAmount(@NotNull JobDescriptor job, @NotNull String message);
 
diff --git a/platform/core-api/src/org/jetbrains/concurrency/Promise.java b/platform/core-api/src/org/jetbrains/concurrency/Promise.java
index 45b8c68c9491..d5cb7a255b1c 100644
--- a/platform/core-api/src/org/jetbrains/concurrency/Promise.java
+++ b/platform/core-api/src/org/jetbrains/concurrency/Promise.java
@@ -91,7 +91,7 @@ public interface Promise<T> {
    * or on promise reject (null as result value will be passed).
    */
   @NotNull
-  Promise<T> onProcessed(@NotNull Consumer<? super T> processed);
+  Promise<T> onProcessed(@NotNull Consumer<? super @Nullable T> processed);
 
   /**
    * Get promise state.
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/IndexDataGetter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/IndexDataGetter.java
index 94814c098e59..5b999afb35e7 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/IndexDataGetter.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/IndexDataGetter.java
@@ -237,7 +237,7 @@ public final class IndexDataGetter {
                       @NotNull IntConsumer consumer) throws IOException {
     if (candidates == null) {
       myIndexStorageBackend.processMessages((commit, message) -> {
-        if (message != null && condition.test(message)) {
+        if (condition.test(message)) {
           consumer.accept(commit);
         }
         return true;