diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/CompositeValidationRule.java b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/CompositeValidationRule.java
index c3860f99bfc..8b6d8807009 100644
--- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/CompositeValidationRule.java
+++ b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/CompositeValidationRule.java
@@ -31,7 +31,6 @@
 import org.adempiere.ad.validationRule.INamePairPredicate;
 import org.adempiere.ad.validationRule.IValidationRule;
 import org.adempiere.ad.validationRule.NamePairPredicates;
-import org.apache.commons.lang3.NotImplementedException;
 import org.compiere.util.ValueNamePair;
 
 import com.google.common.base.MoreObjects;
@@ -135,7 +134,7 @@ public List<ValueNamePair> getExceptionTableAndColumns()
 	@Override
 	public void registerException(final String tableName, final String columnName)
 	{
-		throw new NotImplementedException("There is no implementation for registering exceptions in the composite validation rule class: " + this);
+		throw new UnsupportedOperationException("There is no implementation for registering exceptions in the composite validation rule class: " + this);
 	}
 
 	@Override
diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/NullValidationRule.java b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/NullValidationRule.java
index 49f4d29d40e..efe3059a0de 100644
--- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/NullValidationRule.java
+++ b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/NullValidationRule.java
@@ -6,7 +6,6 @@
 import org.adempiere.ad.expression.api.IStringExpression;
 import org.adempiere.ad.validationRule.INamePairPredicate;
 import org.adempiere.ad.validationRule.IValidationRule;
-import org.apache.commons.lang3.NotImplementedException;
 import org.compiere.util.ValueNamePair;
 
 import com.google.common.collect.ImmutableList;
@@ -65,6 +64,6 @@ public List<ValueNamePair> getExceptionTableAndColumns()
 	@Override
 	public void registerException(final String tableName, final String columnName)
 	{
-		throw new NotImplementedException("There is no implementation for registering esceptions in the null validation rule class: " + this);
+		throw new UnsupportedOperationException("There is no implementation for registering esceptions in the null validation rule class: " + this);
 	}
 };
diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/SQLValidationRule.java b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/SQLValidationRule.java
index 6c85190f647..d4e5aacae8b 100644
--- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/SQLValidationRule.java
+++ b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/validationRule/impl/SQLValidationRule.java
@@ -9,7 +9,6 @@
 import org.adempiere.ad.validationRule.INamePairPredicate;
 import org.adempiere.ad.validationRule.IValidationRule;
 import org.adempiere.util.Services;
-import org.apache.commons.lang3.NotImplementedException;
 import org.compiere.util.ValueNamePair;
 
 import com.google.common.base.MoreObjects;
@@ -104,7 +103,7 @@ public List<ValueNamePair> getExceptionTableAndColumns()
 	@Override
 	public void registerException(final String tableName, final String columnName)
 	{
-		throw new NotImplementedException("There is no implementation for registering exceptions in the SQL validation rule class: " + this);
+		throw new UnsupportedOperationException("There is no implementation for registering exceptions in the SQL validation rule class: " + this);
 	}
 
 }
diff --git a/de.metas.adempiere.adempiere/client/src/main/java/org/compiere/grid/ed/VLookupAutoCompleterValidationRule.java b/de.metas.adempiere.adempiere/client/src/main/java/org/compiere/grid/ed/VLookupAutoCompleterValidationRule.java
index 1722e939950..830247062f5 100644
--- a/de.metas.adempiere.adempiere/client/src/main/java/org/compiere/grid/ed/VLookupAutoCompleterValidationRule.java
+++ b/de.metas.adempiere.adempiere/client/src/main/java/org/compiere/grid/ed/VLookupAutoCompleterValidationRule.java
@@ -28,10 +28,9 @@
 
 import org.adempiere.ad.expression.api.IExpressionFactory;
 import org.adempiere.ad.expression.api.IStringExpression;
-import org.adempiere.ad.validationRule.IValidationRule;
 import org.adempiere.ad.validationRule.INamePairPredicate;
+import org.adempiere.ad.validationRule.IValidationRule;
 import org.adempiere.util.Services;
-import org.apache.commons.lang3.NotImplementedException;
 import org.compiere.util.ValueNamePair;
 
 import com.google.common.collect.ImmutableList;
@@ -107,6 +106,6 @@ public List<ValueNamePair> getExceptionTableAndColumns()
 	@Override
 	public void registerException(final String tableName, final String columnName)
 	{
-		throw new NotImplementedException("There is no implementation for registering esceptions in the VLookupAutoCompleterValidationRule class: " + this);
+		throw new UnsupportedOperationException("There is no implementation for registering esceptions in the VLookupAutoCompleterValidationRule class: " + this);
 	}
 }