diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/security/JCEEncryptor.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/security/JCEEncryptor.java
index fe61770..4516fc4 100644
--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/security/JCEEncryptor.java
+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/security/JCEEncryptor.java
@@ -105,7 +105,7 @@
             bytePassword = Helper.buildBytesFromHexString(encryptedPswd);
             // try AES/CBC first
             password = new String(decryptCipherAES_CBC.doFinal(bytePassword), "UTF-8");
-        } catch (ConversionException ce) {
+        } catch (ConversionException | IllegalBlockSizeException ce) {
             // buildBytesFromHexString failed, assume clear text
             password = encryptedPswd;
         } catch (Exception e) {