diff --git a/platform/analysis-api/src/com/intellij/codeInspection/InspectionEP.java b/platform/analysis-api/src/com/intellij/codeInspection/InspectionEP.java
index 7ca601c5088b..8af5f775ae72 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/InspectionEP.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/InspectionEP.java
@@ -281,6 +281,7 @@ public class InspectionEP extends LanguageExtensionPoint<InspectionProfileEntry>
            ", isInternal=" + isInternal +
            ", getImplementationClassName()='"+getImplementationClassName()+"'" +
            ", language="+language+
+           ", pluginDescriptor="+getPluginDescriptor()+
            '}';
   }
 }
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
index 5a5bc1a43284..7dd23a0379e1 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
@@ -9,6 +9,7 @@ import com.intellij.codeInspection.InspectionProfileEntry;
 import com.intellij.codeInspection.options.OptionController;
 import com.intellij.concurrency.ConcurrentCollectionFactory;
 import com.intellij.configurationStore.SchemeDataHolder;
+import com.intellij.diagnostic.PluginException;
 import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
@@ -631,11 +632,10 @@ public class InspectionProfileImpl extends NewInspectionProfile {
       else {
         key = HighlightDisplayKey.register(shortName, computable, shortName);
       }
-    }
-
-    if (key == null) {
-      LOG.error(shortName + " ; number of initialized tools: " + myTools.size());
-      return;
+      if (key == null) {
+        PluginException.logPluginError(LOG, "Couldn't register HighlightDisplayKey '"+shortName + "' ; number of initialized tools: " + myTools.size()+"; toolWrapper:"+toolWrapper+"; extension:"+extension, null, toolWrapper.getDescriptionContextClass());
+        return;
+      }
     }
 
     HighlightDisplayLevel baseLevel = myBaseProfile != null && myBaseProfile.getToolsOrNull(shortName, project) != null