diff --git a/client/src/org/compiere/grid/ed/VPAttribute.java b/client/src/org/compiere/grid/ed/VPAttribute.java
index 44a38aad61..e44c75ca00 100644
--- a/client/src/org/compiere/grid/ed/VPAttribute.java
+++ b/client/src/org/compiere/grid/ed/VPAttribute.java
@@ -405,8 +405,11 @@ public class VPAttribute extends JComponent
 			{
 				log.log(Level.SEVERE, "", pve);
 			}
-			if (M_AttributeSetInstance_ID == oldValue)
-				m_GridTab.processFieldChange(m_GridField); // fire value changed
+			if (M_AttributeSetInstance_ID == oldValue && m_GridTab != null && m_GridField != null)
+			{
+				//  force Change - user does not realize that embedded object is already saved.
+				m_GridTab.processFieldChange(m_GridField); 
+			}
 		}	//	change
 		m_button.setEnabled(true);
 		requestFocus();