diff --git a/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java b/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
index b66e23a73def86961745edba3fff19968695db0f..4d00cf88ec5fe0db9d0ae1fdfc562be4341cc38f 100644
--- a/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
+++ b/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
@@ -148,6 +148,7 @@ public class PKCS11Exception extends Exception {
             0x00000115,
             0x00000120,
             0x00000121,
+            0x00000130,
             0x00000150,
             0x00000160,
             0x00000170,
@@ -156,6 +157,7 @@ public class PKCS11Exception extends Exception {
             0x00000191,
             0x000001A0,
             0x000001A1,
+            0x00000200,
             0x80000000,
         };
         String[] errorMessages = new String[] {
@@ -234,6 +236,7 @@ public class PKCS11Exception extends Exception {
             "CKR_WRAPPING_KEY_TYPE_INCONSISTENT",
             "CKR_RANDOM_SEED_NOT_SUPPORTED",
             "CKR_RANDOM_NO_RNG",
+            "CKR_DOMAIN_PARAMS_INVALID",
             "CKR_BUFFER_TOO_SMALL",
             "CKR_SAVED_STATE_INVALID",
             "CKR_INFORMATION_SENSITIVE",
@@ -242,6 +245,7 @@ public class PKCS11Exception extends Exception {
             "CKR_CRYPTOKI_ALREADY_INITIALIZED",
             "CKR_MUTEX_BAD",
             "CKR_MUTEX_NOT_LOCKED",
+            "CKR_FUNCTION_REJECTED",
             "CKR_VENDOR_DEFINED",
         };
         errorMap = new HashMap<Long,String>();
diff --git a/src/share/classes/sun/security/x509/X509Key.java b/src/share/classes/sun/security/x509/X509Key.java
index 04855b19b571c5b8bbfc98c2bedb5fb9eba70b9a..3db634e5f03fc1fdb0274810dbbc14743a54dbbe 100644
--- a/src/share/classes/sun/security/x509/X509Key.java
+++ b/src/share/classes/sun/security/x509/X509Key.java
@@ -171,7 +171,7 @@ public class X509Key implements PublicKey {
                                       in.data.getUnalignedBitString());
 
         } catch (InvalidKeyException e) {
-            throw new IOException("subject key, " + e.getMessage());
+            throw new IOException("subject key, " + e.getMessage(), e);
         }
 
         if (in.data.available() != 0)
@@ -224,7 +224,7 @@ public class X509Key implements PublicKey {
         } catch (NoSuchAlgorithmException e) {
             // Return generic X509Key with opaque key data (see below)
         } catch (InvalidKeySpecException e) {
-            throw new InvalidKeyException(e.getMessage());
+            throw new InvalidKeyException(e.getMessage(), e);
         }
 
         /*