diff --git a/src/main/java/org/sentrysoftware/ipmi/core/coding/security/CipherSuite.java b/src/main/java/org/sentrysoftware/ipmi/core/coding/security/CipherSuite.java
index 61f457c..3e096e5 100644
--- a/src/main/java/org/sentrysoftware/ipmi/core/coding/security/CipherSuite.java
+++ b/src/main/java/org/sentrysoftware/ipmi/core/coding/security/CipherSuite.java
@@ -123,6 +123,7 @@ public IntegrityAlgorithm getIntegrityAlgorithm() {
 			return instantiateIntegrityAlgorithm(IntegrityHmacSha1_96::new);
 		case SecurityConstants.IA_MD5_128:
 			// TODO: MD5-128
+			throw new IllegalArgumentException("Integrity algorithm MD5-128 is not yet implemented.");
 		case SecurityConstants.IA_HMAC_MD5_128:
 			return instantiateIntegrityAlgorithm(IntegrityHmacMd5_128::new);
 		case SecurityConstants.IA_HMAC_SHA256_128:
@@ -156,10 +157,10 @@ public ConfidentialityAlgorithm getConfidentialityAlgorithm() {
             return ca;
         case SecurityConstants.CA_XRC4_40:
             // TODO: XRc4-40
-            throw new IllegalArgumentException(NOT_YET_IMPLEMENTED_MESSAGE);
+            throw new IllegalArgumentException("Confidentiality algorithm XRC4-40 is not yet implemented.");
         case SecurityConstants.CA_XRC4_128:
             // TODO: XRc4-128
-            throw new IllegalArgumentException(NOT_YET_IMPLEMENTED_MESSAGE);
+            throw new IllegalArgumentException("Confidentiality algorithm XRC4-128 is not yet implemented.");
         default:
             throw new IllegalArgumentException(
                     "Invalid confidentiality algorithm.");
diff --git a/src/main/java/org/sentrysoftware/ipmi/core/coding/security/IntegrityAlgorithm.java b/src/main/java/org/sentrysoftware/ipmi/core/coding/security/IntegrityAlgorithm.java
index 886a278..856c13f 100644
--- a/src/main/java/org/sentrysoftware/ipmi/core/coding/security/IntegrityAlgorithm.java
+++ b/src/main/java/org/sentrysoftware/ipmi/core/coding/security/IntegrityAlgorithm.java
@@ -104,7 +104,7 @@ public byte[] generateAuthCode(final byte[] base) {
 		final byte[] result = new byte[authCodeLength];
 		byte[] updatedBase;
 
-		if (base[base.length - 2] == 0) { // pas de padding
+		if (base[base.length - 2] == 0) { // No padding
 			updatedBase = injectIntegrityPad(base, authCodeLength);
 		} else {
 			updatedBase = base;