diff --git a/base/src/org/adempiere/pipo/AbstractElementHandler.java b/base/src/org/adempiere/pipo/AbstractElementHandler.java
index 71d3494907..4da8d38423 100644
--- a/base/src/org/adempiere/pipo/AbstractElementHandler.java
+++ b/base/src/org/adempiere/pipo/AbstractElementHandler.java
@@ -276,8 +276,8 @@ public abstract class AbstractElementHandler implements ElementHandler {
 						.append( ", " + idDetail )
 	    				.append( ", " + getPackageImpId(ctx) )
 	    				.append( ", " + tableID )
-	    				.append( ", " + columnID )
-	    				.append( ", " + referenceID )
+	    				.append( ", " + (columnID == -1 ? "null" : columnID) )
+	    				.append( ", " + (referenceID == -1 ? "null" : referenceID) )
 	    				.append( ", '" + (colValue != null ? colValue : from.get_Value(i)) )
 	    				.append( "')");
 	    		
diff --git a/base/src/org/adempiere/pipo/handler/MenuElementHandler.java b/base/src/org/adempiere/pipo/handler/MenuElementHandler.java
index 0cbe0d8228..f8ce98708c 100644
--- a/base/src/org/adempiere/pipo/handler/MenuElementHandler.java
+++ b/base/src/org/adempiere/pipo/handler/MenuElementHandler.java
@@ -189,8 +189,8 @@ public class MenuElementHandler extends AbstractElementHandler {
 						int columnID = DB.getSQLValue(getTrxName(ctx), sql
 								.toString(), tableID);
 						sql = new StringBuffer(
-								"SELECT AD_Reference_ID FROM AD_COLUMN WHERE AD_Column_ID = '"
-										+ columnID + "'");
+								"SELECT AD_Reference_ID FROM AD_COLUMN WHERE AD_Column_ID = "
+										+ (columnID == -1 ? "null" : columnID));
 						int referenceID = DB.getSQLValue(getTrxName(ctx), sql
 								.toString());
 						int idBackup = MSequence.getNextID(Env
@@ -226,9 +226,9 @@ public class MenuElementHandler extends AbstractElementHandler {
 										+ ", "
 										+ tableID
 										+ ", "
-										+ columnID
+										+ (columnID == -1 ? "null" : columnID)
 										+ ", "
-										+ referenceID
+										+ (referenceID == -1 ? "null" : referenceID)
 										+ ", '" + colValue + "')");
 						int no = DB.executeUpdate(sqlD.toString(),
 								getTrxName(ctx));