--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java	Tue Sep 02 14:11:38 2014 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java	Tue Sep 02 22:23:04 2014 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,8 +158,8 @@
         // publicKey's format must be X.509 otherwise
         // the whole CertGen part of this class is broken.
         if (!"X.509".equalsIgnoreCase(publicKey.getFormat())) {
-            throw new IllegalArgumentException("publicKey's is not X.509, but "
-                    + publicKey.getFormat());
+            throw new IllegalArgumentException("Public key format is "
+                + publicKey.getFormat() + ", must be X.509");
         }
     }