diff --git a/org.adempiere.base/src/org/compiere/model/GridTable.java b/org.adempiere.base/src/org/compiere/model/GridTable.java
index ab1c166058..39f557504f 100644
--- a/org.adempiere.base/src/org/compiere/model/GridTable.java
+++ b/org.adempiere.base/src/org/compiere/model/GridTable.java
@@ -2844,7 +2844,8 @@ public class GridTable extends AbstractTableModel
 		}
 
 		//	update buffer
-		setDataAtRow(row, rowDataDB);
+		if (rowDataDB!=null)
+			setDataAtRow(row, rowDataDB);
 		//	info
 		m_rowData = null;
 		m_changed = false;