1 files changed, 4 insertions, 1 deletions
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/ScopesAndSeveritiesTable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/ScopesAndSeveritiesTable.java
index 385b764af027..58e35083a247 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/ScopesAndSeveritiesTable.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/ScopesAndSeveritiesTable.java
@@ -357,6 +357,9 @@ public class ScopesAndSeveritiesTable extends JBTable {
       }
       else if (columnIndex == SCOPE_ENABLED_COLUMN) {
         final NamedScope scope = getScope(rowIndex);
+        if (scope == null) {
+          return;
+        }
         if ((Boolean)value) {
           if (rowIndex == lastRowIndex()) {
             myInspectionProfile.enableToolsByDefault(myKeyNames, myProject);
@@ -381,7 +384,7 @@ public class ScopesAndSeveritiesTable extends JBTable {
     @Override
     public void removeRow(final int idx) {
       if (idx != lastRowIndex()) {
-        myInspectionProfile.removeScopes(myKeyNames, getScope(idx), myProject);
+        myInspectionProfile.removeScopes(myKeyNames, getScopeName(idx), myProject);
         refreshAggregatedScopes();
         myTableSettings.onScopeRemoved(getRowCount());
       }