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 58aea64731..c59a3f5914 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
@@ -299,7 +299,8 @@ public class WCreateFromShipmentUI extends CreateFromShipment implements EventLi
 		//sameWarehouseCb
         else if (e.getTarget().equals(sameWarehouseCb))
         {
-        	initBPOrderDetails(((Integer)bPartnerField.getValue()).intValue(), false);
+        	int bpId = bPartnerField.getValue() == null?0:((Integer)bPartnerField.getValue()).intValue();
+        	initBPOrderDetails(bpId, false);
         }	
 		else if (e.getTarget().equals(upcField.getComponent()))
 		{