diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
index 63fefa2b78..85e5390d95 100755
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
@@ -447,7 +447,7 @@ public class WAllocation extends Allocation
 		String name = e.getPropertyName();
 		Object value = e.getNewValue();
 		if (log.isLoggable(Level.CONFIG)) log.config(name + "=" + value);
-		if (value == null)
+		if (value == null && !name.equals("C_Charge_ID"))
 			return;
 		
 		// Organization
@@ -460,7 +460,7 @@ public class WAllocation extends Allocation
 		//		Charge
 		else if (name.equals("C_Charge_ID") )
 		{
-			m_C_Charge_ID = ((Integer) value).intValue();
+			m_C_Charge_ID = value!=null? ((Integer) value).intValue() : 0;
 			
 			setAllocateButton();
 		}