diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
index 1fd2d334a0..58aea64731 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
@@ -367,7 +367,11 @@ public class WCreateFromShipmentUI extends CreateFromShipment implements EventLi
 		//  BPartner - load Order/Invoice/Shipment
 		if (e.getPropertyName().equals("C_BPartner_ID"))
 		{
-			int C_BPartner_ID = ((Integer)e.getNewValue()).intValue();
+			int C_BPartner_ID = 0; 
+			if (e.getNewValue() != null){
+				C_BPartner_ID = ((Integer)e.getNewValue()).intValue();
+			}
+			
 			initBPOrderDetails (C_BPartner_ID, true);
 		}
 		window.tableChanged(null);