diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java index cf8fa7146d42..871a7744983c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java @@ -116,7 +116,7 @@ public class ImplementationViewComponent extends JPanel { public ImplementationViewComponent(PsiElement[] elements, final int index) { super(new BorderLayout()); - final Project project = elements[0].getProject(); + final Project project = elements.length > 0 ? elements[0].getProject() : null; EditorFactory factory = EditorFactory.getInstance(); Document doc = factory.createDocument(""); doc.setReadOnly(true); diff --git a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java index d2a4c63524e6..682e3bd6221e 100644 --- a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java @@ -107,6 +107,7 @@ public class HelpManagerImpl extends HelpManager { return helpSet; } catch (Exception ee) { + LOG.info("Failed to create help set", ee); return null; } } diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/engine/BaseSpellChecker.java b/plugins/spellchecker/src/com/intellij/spellchecker/engine/BaseSpellChecker.java index 70119cf69428..7f3e6e116b29 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/engine/BaseSpellChecker.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/engine/BaseSpellChecker.java @@ -149,7 +149,8 @@ public class BaseSpellChecker implements SpellCheckerEngine { UIUtil.invokeLaterIfNeeded(new Runnable() { @Override public void run() { - DaemonCodeAnalyzer.getInstance(project).restart(); + final DaemonCodeAnalyzer instance = DaemonCodeAnalyzer.getInstance(project); + if (instance != null) instance.restart(); } }); }