diff --git a/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/WalletUtils.java b/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/WalletUtils.java
index 515d2def..339f5b19 100644
--- a/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/WalletUtils.java
+++ b/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/WalletUtils.java
@@ -194,7 +194,11 @@ public static Credentials getCredentials(
       wallet.setWalletArray(walletBytes, walletPassword);
     }
     catch (IOException ioException) {
-      throw new IllegalStateException("Failed to open wallet", ioException);
+      String message = "Failed to open wallet. The wallet content may be corrupted or incomplete.";
+      if (walletPassword != null) {
+        message += " If a walletPassword is required and was provided, it may be incorrect.";
+      }
+      throw new IllegalStateException(message, ioException);
     }
 
     try {