diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
index a577f1028d..c6b7f53065 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
@@ -144,7 +144,7 @@ final class ConfigurationClass {
 
 		public FinalConfigurationProblem() {
 			super(String.format("@Configuration class '%s' may not be final. Remove the final modifier to continue.",
-					getSimpleName()), new Location(getResource()));
+					getSimpleName()), new Location(getResource(), ConfigurationClass.this));
 		}
 	}
 
@@ -155,7 +155,7 @@ final class ConfigurationClass {
 		public OverloadedMethodProblem(String methodName, int count) {
 			super(String.format("@Configuration class '%s' has %s overloaded factory methods of name '%s'. " +
 					"Only one factory method of the same name allowed.",
-					getSimpleName(), count, methodName), new Location(getResource()));
+					getSimpleName(), count, methodName), new Location(getResource(), ConfigurationClass.this));
 		}
 	}
 
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethod.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethod.java
index a93ecc0e63..fd9ea2a9a8 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethod.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethod.java
@@ -53,7 +53,7 @@ final class ConfigurationClassMethod {
 	}
 
 	public Location getResourceLocation() {
-		return new Location(this.declaringClass.getResource(), this.metadata.getMethodName());
+		return new Location(this.declaringClass.getResource(), metadata);
 	}
 
 	public void validate(ProblemReporter problemReporter) {