diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
index ce720f2adb..c5b34d7e21 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
@@ -135,6 +135,11 @@ public class WLocatorEditor extends WEditor implements EventListener, PropertyCh
 	
 	private void setValue (Object value, boolean fire)
 	{
+		if(m_mLocator==null)
+		{
+			return;
+		}
+			
 		if (value != null)
 		{
 			m_mLocator.setOnly_Warehouse_ID (getOnly_Warehouse_ID ());