diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
index ce37ae5d632..dd21f2295c1 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
@@ -137,11 +137,6 @@ public class DeclarationResolver {
             JetClassOrObject classOrObject = entry.getKey();
             MutableClassDescriptor classDescriptor = (MutableClassDescriptor) entry.getValue();
 
-            JetClassBody jetClassBody = classOrObject.getBody();
-            if (classDescriptor.getKind() == ClassKind.ANNOTATION_CLASS && jetClassBody != null) {
-                trace.report(ANNOTATION_CLASS_WITH_BODY.on(jetClassBody));
-            }
-
             resolveFunctionAndPropertyHeaders(
                     c,
                     classOrObject.getDeclarations(), classDescriptor.getScopeForMemberDeclarationResolution(),
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
index 93a2a6028d4..32024e5c1f4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
@@ -210,6 +210,9 @@ public class DeclarationsChecker {
             checkTraitModifiers(aClass);
             checkConstructorInTrait(aClass);
         }
+        else if (aClass.isAnnotation()) {
+            checkAnnotationClassWithBody(aClass);
+        }
         else if (aClass.isEnum()) {
             checkEnumModifiers(aClass);
         }
@@ -240,6 +243,11 @@ public class DeclarationsChecker {
         }
     }
 
+    private void checkAnnotationClassWithBody(JetClassOrObject classOrObject) {
+        if (classOrObject.getBody() != null) {
+            trace.report(ANNOTATION_CLASS_WITH_BODY.on(classOrObject.getBody()));
+        }
+    }
 
     private void checkOpenMembers(ClassDescriptorWithResolutionScopes classDescriptor) {
         for (CallableMemberDescriptor memberDescriptor : classDescriptor.getDeclaredCallableMembers()) {