diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedFieldAccessInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedFieldAccessInspection.java
index 57fe539de724..4746a0aa1448 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedFieldAccessInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedFieldAccessInspection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2013 Bas Leijdekkers
+ * Copyright 2006-2016 Bas Leijdekkers
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package com.siyeh.ig.style;
 import com.intellij.codeInspection.CleanupLocalInspectionTool;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtil;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
@@ -71,10 +72,13 @@ public class UnqualifiedFieldAccessInspection extends BaseInspection implements
         return;
       }
       final PsiClass fieldClass = field.getContainingClass();
-      if (fieldClass instanceof PsiAnonymousClass) {
+      if (fieldClass == null) {
+        return;
+      }
+      if (PsiUtil.isLocalOrAnonymousClass(fieldClass)) {
         final PsiClass expressionClass = PsiTreeUtil.getParentOfType(expression, PsiClass.class);
         if (expressionClass != null && !expressionClass.equals(fieldClass)) {
-          // qualified this expression not possible for anonymous class
+          // qualified this expression not possible for anonymous or local class
           return;
         }
       }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unqualified_field_access/UnqualifiedFieldAccess.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unqualified_field_access/UnqualifiedFieldAccess.java
index 737d11b15f18..27ba03166372 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unqualified_field_access/UnqualifiedFieldAccess.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unqualified_field_access/UnqualifiedFieldAccess.java
@@ -21,6 +21,16 @@ public class UnqualifiedFieldAccess {
         };
       }
     };
+    class A {
+      int i;
+      void a() {
+        new Object() {
+          void b() {
+            System.out.println(i);
+          }
+        };
+      }
+    }
   }
 
   void simpleAnonymous() {