3 files changed, 6 insertions, 14 deletions
diff --git a/platform/analysis-api/src/com/intellij/codeInspection/ex/ScopeToolState.java b/platform/analysis-api/src/com/intellij/codeInspection/ex/ScopeToolState.java
index 3a75f1738ead..81e340679a50 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/ex/ScopeToolState.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/ex/ScopeToolState.java
@@ -42,6 +42,7 @@ public class ScopeToolState {
   private boolean myEnabled;
   private HighlightDisplayLevel myLevel;
 
+  private boolean myAdditionalConfigPanelCreated = false;
   private JComponent myAdditionalConfigPanel;
   private static final Logger LOG = Logger.getInstance("#" + ScopeToolState.class.getName());
 
@@ -98,13 +99,11 @@ public class ScopeToolState {
     myLevel = level;
   }
 
-  @NotNull
+  @Nullable
   public JComponent getAdditionalConfigPanel() {
-    if (myAdditionalConfigPanel == null) {
+    if (!myAdditionalConfigPanelCreated) {
       myAdditionalConfigPanel = myToolWrapper.getTool().createOptionsPanel();
-      if (myAdditionalConfigPanel == null){
-        myAdditionalConfigPanel = new JPanel();
-      }
+      myAdditionalConfigPanelCreated = true;
     }
     return myAdditionalConfigPanel;
   }
diff --git a/platform/analysis-api/src/com/intellij/codeInspection/reference/RefManager.java b/platform/analysis-api/src/com/intellij/codeInspection/reference/RefManager.java
index 6f0a3c24e523..b46352670030 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/reference/RefManager.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/reference/RefManager.java
@@ -47,6 +47,7 @@ public abstract class RefManager {
    *
    * @return the analysis scope.
    */
+  @Nullable
   public abstract AnalysisScope getScope();
 
   /**
diff --git a/platform/analysis-api/src/com/intellij/codeInspection/ui/OptionAccessor.java b/platform/analysis-api/src/com/intellij/codeInspection/ui/OptionAccessor.java
index 0c32f60dadd0..5e23b224920f 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/ui/OptionAccessor.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/ui/OptionAccessor.java
@@ -43,15 +43,7 @@ public interface OptionAccessor {
 
     @Override
     public void setOption(final String optionName, boolean optionValue) {
-      try {
-        ReflectionUtil.findField(myInspection.getClass(), boolean.class, optionName).setBoolean(myInspection, optionValue);
-      }
-      catch (IllegalAccessException e) {
-        LOG.warn(e);
-      }
-      catch (NoSuchFieldException e) {
-        LOG.warn(e);
-      }
+      ReflectionUtil.setField(myInspection.getClass(), myInspection, boolean.class, optionName, optionValue);
     }
   }
 }