diff --git a/org.adempiere.base/src/org/compiere/model/MMovementLine.java b/org.adempiere.base/src/org/compiere/model/MMovementLine.java
index fc6af5ec14..118dac29b3 100644
--- a/org.adempiere.base/src/org/compiere/model/MMovementLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MMovementLine.java
@@ -211,11 +211,11 @@ public class MMovementLine extends X_M_MovementLine
 		//      Mandatory Instance
 		MProduct product = getProduct();
 		if (getM_AttributeSetInstance_ID() == 0) {
-			if (product != null && product.getAttributeSet()==null) {
-				log.saveError("NoAttributeSet", product.getValue());
-				return false;
-			}
 			if (product != null && product.isASIMandatory(true)) {
+				if (product.getAttributeSet()==null) {
+					log.saveError("NoAttributeSet", product.getValue());
+					return false;
+				}
 				if (! product.getAttributeSet().excludeTableEntry(MMovementLine.Table_ID, true /*outgoing*/)) {
 					log.saveError("FillMandatory", Msg.getElement(getCtx(), COLUMNNAME_M_AttributeSetInstance_ID));
 					return false;
@@ -231,12 +231,12 @@ public class MMovementLine extends X_M_MovementLine
 					setM_AttributeSetInstanceTo_ID(getM_AttributeSetInstance_ID());
 			}
 			
-			if (product != null && product.getAttributeSet()==null) {
-				log.saveError("NoAttributeSet", product.getValue());
-				return false;
-			}
 			if (product != null && product.isASIMandatory(false) && getM_AttributeSetInstanceTo_ID() == 0)
 			{
+				if (product.getAttributeSet()==null) {
+					log.saveError("NoAttributeSet", product.getValue());
+					return false;
+				}
 				if (! product.getAttributeSet().excludeTableEntry(MMovementLine.Table_ID, false /*incoming*/)) {
 					log.saveError("FillMandatory", Msg.getElement(getCtx(), COLUMNNAME_M_AttributeSetInstanceTo_ID));
 					return false;