Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rd55a76ed168ceba36a6b246b46096a4b27f71427
--- lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	(.../Authenticator.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	(.../Authenticator.java)	(revision d55a76ed168ceba36a6b246b46096a4b27f71427)
@@ -23,8 +23,6 @@
 
 package org.lamsfoundation.lams.integration.security;
 
-import java.security.NoSuchAlgorithmException;
-
 import org.lamsfoundation.lams.integration.ExtServerOrgMap;
 import org.lamsfoundation.lams.util.HashUtil;
 
@@ -59,13 +57,9 @@
 	}
 	
 	private static void checkHash(String plaintext, String hashValue) throws AuthenticationException {
-		try{
 			if(!hashValue.equals(HashUtil.sha1(plaintext))){
 			    throw new AuthenticationException("Authentication failed!");
 			}
-		}catch(NoSuchAlgorithmException e){
-			throw new AuthenticationException("The system does not support the required algorithm to do authentication!");
-		}
 	}
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/util/HashUtil.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rd55a76ed168ceba36a6b246b46096a4b27f71427
--- lams_common/src/java/org/lamsfoundation/lams/util/HashUtil.java	(.../HashUtil.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/util/HashUtil.java	(.../HashUtil.java)	(revision d55a76ed168ceba36a6b246b46096a4b27f71427)
@@ -40,14 +40,22 @@
  */
 public class HashUtil {
 
-    public static String sha1(String plaintext) throws NoSuchAlgorithmException{
-        MessageDigest md = MessageDigest.getInstance("SHA1");
-        return new String(Hex.encodeHex(md.digest(plaintext.getBytes())));
+    public static String sha1(String plaintext){
+		try {
+			MessageDigest md = MessageDigest.getInstance("SHA1");
+	        return new String(Hex.encodeHex(md.digest(plaintext.getBytes())));
+		} catch (NoSuchAlgorithmException e) {
+			throw new RuntimeException(e);
+		}
     }
 
-    public static String md5(String plaintext) throws NoSuchAlgorithmException{
-        MessageDigest md = MessageDigest.getInstance("MD5");
-        return new String(Hex.encodeHex(md.digest(plaintext.getBytes())));       
+    public static String md5(String plaintext){
+        try {
+			MessageDigest md = MessageDigest.getInstance("MD5");
+			return new String(Hex.encodeHex(md.digest(plaintext.getBytes())));
+		} catch (NoSuchAlgorithmException e) {
+			throw new RuntimeException(e);
+		}       
     }
     
 }