1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/lombok/javac/HandlerLibrary.java b/src/core/lombok/javac/HandlerLibrary.java
index bbbdacd0..5b792874 100644
--- a/src/core/lombok/javac/HandlerLibrary.java
+++ b/src/core/lombok/javac/HandlerLibrary.java
@@ -183,7 +183,13 @@ public class HandlerLibrary {
 	 */
 	public void callASTVisitors(JavacAST ast) {
 		for (JavacASTVisitor visitor : visitorHandlers) try {
-			ast.traverse(visitor);
+			if (!visitor.isResolutionBased()) ast.traverse(visitor);
+		} catch (Throwable t) {
+			javacError(String.format("Lombok visitor handler %s failed", visitor.getClass()), t);
+		}
+		
+		for (JavacASTVisitor visitor : visitorHandlers) try {
+			if (visitor.isResolutionBased()) ast.traverse(visitor);
 		} catch (Throwable t) {
 			javacError(String.format("Lombok visitor handler %s failed", visitor.getClass()), t);
 		}