Index: modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java =================================================================== --- modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java (revision 420501) +++ modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java (working copy) @@ -107,9 +107,6 @@ public static final ExemptionMechanism getInstance(String algorithm, String provider) throws NoSuchAlgorithmException, NoSuchProviderException { - if (algorithm == null) { - throw new NullPointerException("Algorithm is null"); - } if (provider == null) { throw new IllegalArgumentException("Provider is null"); } @@ -117,6 +114,9 @@ if (impProvider == null) { throw new NoSuchProviderException(provider); } + if (algorithm == null) { + throw new NullPointerException("Algorithm is null"); + } return getInstance(algorithm, impProvider); }