diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java
index 67dd7b02b0..f7f224415e 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java
@@ -99,12 +99,10 @@ public enum EmbeddedDatabaseConnection {
 	 */
 	public static boolean isEmbedded(ConnectionFactory connectionFactory) {
 		OptionsCapableConnectionFactory optionsCapable = OptionsCapableConnectionFactory.unwrapFrom(connectionFactory);
-		if (optionsCapable == null) {
-			throw new IllegalArgumentException(
-					"Cannot determine database's type as ConnectionFactory is not options-capable. To be "
-							+ "options-capable, a ConnectionFactory should be created with "
-							+ ConnectionFactoryBuilder.class.getName());
-		}
+		Assert.notNull(optionsCapable,
+				() -> "Cannot determine database's type as ConnectionFactory is not options-capable. To be "
+						+ "options-capable, a ConnectionFactory should be created with "
+						+ ConnectionFactoryBuilder.class.getName());
 		ConnectionFactoryOptions options = optionsCapable.getOptions();
 		for (EmbeddedDatabaseConnection candidate : values()) {
 			if (candidate.embedded.test(options)) {