diff --git a/core/src/main/java/org/springframework/ldap/support/LdapUtils.java b/core/src/main/java/org/springframework/ldap/support/LdapUtils.java
index c4fb3492..502fca88 100644
--- a/core/src/main/java/org/springframework/ldap/support/LdapUtils.java
+++ b/core/src/main/java/org/springframework/ldap/support/LdapUtils.java
@@ -782,7 +782,8 @@ public final class LdapUtils {
 
 		@Override
 		public void handleAttributeValue(String attributeName, Object attributeValue, int index) {
-			Assert.isTrue(attributeName == null || this.clazz.isAssignableFrom(attributeValue.getClass()));
+			Assert.isTrue(attributeName == null || this.clazz.isAssignableFrom(attributeValue.getClass()),
+					() -> "either attributeName must be null or the attribute value must be of type " + this.clazz);
 			this.collection.add(this.clazz.cast(attributeValue));
 		}
 
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
index 7cef3dcf..38d402f1 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
@@ -54,7 +54,7 @@ public final class LdapTransactionUtils {
 	 * name.
 	 */
 	public static Name getFirstArgumentAsName(Object[] args) {
-		Assert.notEmpty(args);
+		Assert.notEmpty(args, "args cannot be empty");
 
 		Object firstArg = args[0];
 		return getArgumentAsName(firstArg);
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java
index ae6c529b..ae04738a 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java
@@ -55,7 +55,7 @@ public class ModifyAttributesOperationRecorder implements CompensatingTransactio
 	 * CompensatingTransactionOperationRecorder#recordOperation(java.lang.Object[])
 	 */
 	public CompensatingTransactionOperationExecutor recordOperation(Object[] args) {
-		Assert.notNull(args);
+		Assert.notNull(args, "args cannot be empty");
 		Name dn = LdapTransactionUtils.getFirstArgumentAsName(args);
 		if (args.length != 2 || !(args[1] instanceof ModificationItem[])) {
 			throw new IllegalArgumentException("Unexpected arguments to ModifyAttributes operation");
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java
index a07042c4..cb3fe6c0 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java
@@ -54,7 +54,7 @@ public class RenameOperationRecorder implements CompensatingTransactionOperation
 	 */
 	public CompensatingTransactionOperationExecutor recordOperation(Object[] args) {
 		log.debug("Storing rollback information for rename operation");
-		Assert.notEmpty(args);
+		Assert.notEmpty(args, "args cannot be empty");
 		if (args.length != 2) {
 			// This really shouldn't happen.
 			throw new IllegalArgumentException("Illegal argument length");
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 75f7d18e..5791b6fb 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -14,7 +14,7 @@ repositories {
 ext.queryDslVersion = '5.0.0'
 
 dependencies {
-	api platform("org.springframework:spring-framework-bom:6.0.10")
+	api platform("org.springframework:spring-framework-bom:6.1.0-M2")
 	api platform("org.springframework.data:spring-data-bom:2021.2.13")
 	api platform('com.fasterxml.jackson:jackson-bom:2.15.2')
 	api platform("org.junit:junit-bom:5.9.3")
diff --git a/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java b/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java
index b0a00a47..0fd0287b 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java
@@ -40,7 +40,7 @@ public class ContextSourceEc2InstanceLaunchingFactoryBean extends AbstractEc2Ins
 
 	@Override
 	protected final Object doCreateInstance(final String dnsName) throws Exception {
-		Assert.hasText(this.userDn);
+		Assert.hasText(this.userDn, "userDn cannot be null");
 		LdapContextSource instance = new LdapContextSource();
 		instance.setUrl("ldap://" + dnsName);
 		instance.setUserDn(this.userDn);