1 files changed, 7 insertions, 9 deletions
diff --git a/src/com/isode/stroke/sasl/SCRAMSHA1ClientAuthenticator.java b/src/com/isode/stroke/sasl/SCRAMSHA1ClientAuthenticator.java
index 1d2b4d9..2b302d0 100644
--- a/src/com/isode/stroke/sasl/SCRAMSHA1ClientAuthenticator.java
+++ b/src/com/isode/stroke/sasl/SCRAMSHA1ClientAuthenticator.java
@@ -8,17 +8,15 @@
  */
 package com.isode.stroke.sasl;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.isode.stroke.base.ByteArray;
 import com.isode.stroke.base.SafeByteArray;
-import com.ibm.icu.text.StringPrepParseException;
+import com.isode.stroke.crypto.CryptoProvider;
+import com.isode.stroke.idn.IDNConverter;
 import com.isode.stroke.stringcodecs.Base64;
 import com.isode.stroke.stringcodecs.PBKDF2;
-import com.isode.stroke.idn.IDNConverter;
-import com.isode.stroke.crypto.CryptoProvider;
-import java.text.Normalizer;
-import java.text.Normalizer.Form;
-import java.util.HashMap;
-import java.util.Map;
 
 public class SCRAMSHA1ClientAuthenticator extends ClientAuthenticator {
 
@@ -113,7 +111,7 @@ public class SCRAMSHA1ClientAuthenticator extends ClientAuthenticator {
             // Compute all the values needed for the server signature
             try {
                 saltedPassword = PBKDF2.encode(idnConverter.getStringPrepared(getPassword(), IDNConverter.StringPrepProfile.SASLPrep), salt, iterations, crypto);         
-            } catch (StringPrepParseException e) {
+            } catch (IllegalArgumentException e) {
 
             }
             authMessage = getInitialBareClientMessage().append(",").append(initialServerMessage).append(",").append(getFinalMessageWithoutProof());
@@ -161,7 +159,7 @@ public class SCRAMSHA1ClientAuthenticator extends ClientAuthenticator {
         String authenticationID = "";
         try {
             authenticationID = idnConverter.getStringPrepared(getAuthenticationID(), IDNConverter.StringPrepProfile.SASLPrep);
-        } catch (StringPrepParseException e) {
+        } catch (IllegalArgumentException e) {
 
         }
         return new ByteArray("n=" + escape(authenticationID) + ",r=" + clientnonce);