diff --git a/base/src/org/compiere/model/MOrder.java b/base/src/org/compiere/model/MOrder.java
index 196bbfe942..421d205f3c 100644
--- a/base/src/org/compiere/model/MOrder.java
+++ b/base/src/org/compiere/model/MOrder.java
@@ -1230,12 +1230,7 @@ public class MOrder extends X_C_Order implements DocAction
 					&& !MSysConfig.getBooleanValue("CHECK_CREDIT_ON_PREPAY_ORDER", true, getAD_Client_ID(), getAD_Org_ID())) {
 				// ignore -- don't validate Prepay Orders depending on sysconfig parameter
 			} else {
-				MBPartner bp = null;
-				if (getC_BPartner_ID() != getBill_BPartner_ID()) {
-					bp = new MBPartner (getCtx(), getBill_BPartner_ID(), get_TrxName());
-				} else {
-					bp = new MBPartner (getCtx(), getC_BPartner_ID(), get_TrxName());
-				}
+				MBPartner bp = new MBPartner (getCtx(), getBill_BPartner_ID(), get_TrxName()); // bill bp is guaranteed on beforeSave
 
 				if (MBPartner.SOCREDITSTATUS_CreditStop.equals(bp.getSOCreditStatus()))
 				{