@@ -36,17 +36,12 @@ public AbstractOttoHandler(String target, AndroidAnnotationsEnvironment environm
 	@Override
 	public void validate(Element element, ElementValidation valid) {
 		if (!annotationHelper.enclosingElementHasEnhancedComponentAnnotation(element)) {
-			valid.invalidate();
+			// do nothing when otto annotations are used in non-enhanced classes
 			return;
 		}
 
 		ExecutableElement executableElement = (ExecutableElement) element;
 
-		/*
-		 * We check that twice to skip invalid annotated elements
-		 */
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(executableElement, valid);
-
 		validateReturnType(executableElement, valid);
 
 		validatorHelper.isPublic(element, valid);
@@ -64,6 +59,10 @@ public void validate(Element element, ElementValidation valid) {
 
 	@Override
 	public void process(Element element, EComponentHolder holder) throws Exception {
+		if (!annotationHelper.enclosingElementHasEnhancedComponentAnnotation(element)) {
+			// do nothing when otto annotations are used in non-enhanced classes
+			return;
+		}
 		ExecutableElement executableElement = (ExecutableElement) element;
 
 		JMethod method = codeModelHelper.overrideAnnotatedMethod(executableElement, holder);