Merge branch '1.1.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java

@@ -48,11 +48,11 @@ public abstract class SpringBootCondition implements Condition {
 			return outcome.isMatch();
 		}
 		catch (NoClassDefFoundError ex) {
-			throw new IllegalStateException(
-					"Could not evaluate condition owing to internal class not found. "
-							+ "This can happen if you are @ComponentScanning a "
-							+ "springframework package (e.g. if you put a @ComponentScan "
-							+ "in the default package by mistake)", ex);
+			throw new IllegalStateException("Could not evaluate condition on "
+					+ classOrMethodName + " due to internal class not found. "
+					+ "This can happen if you are @ComponentScanning a "
+					+ "springframework package (e.g. if you put a @ComponentScan "
+					+ "in the default package by mistake)", ex);
 		}
 		catch (RuntimeException ex) {
 			throw new IllegalStateException("Error processing condition on "