diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
index 6c5c9096fac1..2970640aa1cc 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
@@ -232,12 +232,8 @@ public class DataFlowRunner {
     }
     else if (instruction instanceof EmptyInstruction) {
       PsiElement anchor = ((EmptyInstruction)instruction).getAnchor();
-      if (anchor instanceof PsiDeclarationStatement) {
-        for (PsiElement element : ((PsiDeclarationStatement)anchor).getDeclaredElements()) {
-          if (element instanceof PsiClass) {
-            registerNestedClosures(instructionState, (PsiClass)element);
-          }
-        }
+      if (anchor instanceof PsiClass) {
+        registerNestedClosures(instructionState, (PsiClass)anchor);
       }
     }
 
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/LocalClass.java b/java/java-tests/testData/inspection/dataFlow/fixture/LocalClass.java
index 76196ecae368..b991cbf5af6d 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/LocalClass.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/LocalClass.java
@@ -13,5 +13,10 @@ class Test {
         }
       }
     }
+    class Local {
+      void s(@Nullable String s) {
+        final int i = <warning descr="Method invocation 's.hashCode()' may produce 'java.lang.NullPointerException'">s.hashCode()</warning>;
+      }
+    }
   }
 }
\ No newline at end of file