diff --git a/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/ParameterStorePasswordProvider.java b/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/ParameterStorePasswordProvider.java
index a3b1bb7e..27aa3c2a 100644
--- a/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/ParameterStorePasswordProvider.java
+++ b/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/ParameterStorePasswordProvider.java
@@ -73,6 +73,10 @@ public ParameterStorePasswordProvider() {
    */
   @Override
   public char[] getPassword(Map<Parameter, CharSequence> parameterValues) {
-    return getSecret(parameterValues).toCharArray();
+    String password = getSecret(parameterValues);
+    if (password == null || password.trim().isEmpty()) {
+      throw new IllegalArgumentException("Password parameter content is blank.");
+    }
+    return password.toCharArray();
   }
 }
\ No newline at end of file
diff --git a/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/ParameterStoreUsernameProvider.java b/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/ParameterStoreUsernameProvider.java
index 8109100d..bab44746 100644
--- a/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/ParameterStoreUsernameProvider.java
+++ b/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/ParameterStoreUsernameProvider.java
@@ -73,6 +73,10 @@ public ParameterStoreUsernameProvider() {
    */
   @Override
   public String getUsername(Map<Parameter, CharSequence> parameterValues) {
-    return getSecret(parameterValues);
+    String username = getSecret(parameterValues);
+    if (username == null || username.trim().isEmpty()) {
+      throw new IllegalArgumentException("Username parameter content is blank.");
+    }
+    return username;
   }
 }
\ No newline at end of file
diff --git a/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/SecretsManagerPasswordProvider.java b/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/SecretsManagerPasswordProvider.java
index 13360f74..837b8c58 100644
--- a/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/SecretsManagerPasswordProvider.java
+++ b/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/SecretsManagerPasswordProvider.java
@@ -72,6 +72,10 @@ public SecretsManagerPasswordProvider() {
    */
   @Override
   public char[] getPassword(Map<Parameter, CharSequence> parameterValues) {
-    return getSecret(parameterValues).toCharArray();
+    String password = getSecret(parameterValues);
+    if (password == null || password.trim().isEmpty()) {
+      throw new IllegalArgumentException("Password secret content is blank.");
+    }
+    return password.toCharArray();
   }
 }
diff --git a/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/SecretsManagerUsernameProvider.java b/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/SecretsManagerUsernameProvider.java
index 00e62d08..4294aef9 100644
--- a/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/SecretsManagerUsernameProvider.java
+++ b/ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/SecretsManagerUsernameProvider.java
@@ -72,6 +72,10 @@ public SecretsManagerUsernameProvider() {
    */
   @Override
   public String getUsername(Map<Parameter, CharSequence> parameterValues) {
-    return getSecret(parameterValues);
+    String username = getSecret(parameterValues);
+    if (username == null || username.trim().isEmpty()) {
+      throw new IllegalArgumentException("Username secret content is blank.");
+    }
+    return username;
   }
 }