diff --git a/org.adempiere.base/src/org/adempiere/base/AbstractModelFactory.java b/org.adempiere.base/src/org/adempiere/base/AbstractModelFactory.java
index 047089faeb..d9e496669a 100644
--- a/org.adempiere.base/src/org/adempiere/base/AbstractModelFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/AbstractModelFactory.java
@@ -53,6 +53,8 @@ public abstract class AbstractModelFactory implements IModelFactory {
 		MTable table = MTable.get(Env.getCtx(), tableName);
 		if (table != null && table.isUUIDKeyTable())
 		{
+			if (Record_ID == 0) // this is the convention to create a new record
+				return getPO(clazz, tableName, "", trxName); // get new Record using UUID constructor
 			return null;
 		}