diff --git a/org.adempiere.base/src/org/compiere/model/PO.java b/org.adempiere.base/src/org/compiere/model/PO.java
index 1a4c6fc5c4..5f7c569e93 100644
--- a/org.adempiere.base/src/org/compiere/model/PO.java
+++ b/org.adempiere.base/src/org/compiere/model/PO.java
@@ -2032,7 +2032,7 @@ public abstract class PO
 			}	//	UUID key search
 		}
 
-		if (m_KeyColumns.length == 0)
+		if (m_KeyColumns == null || m_KeyColumns.length == 0)
 			throw new IllegalStateException("No PK, UU nor FK - " + p_info.getTableName());
 	}	//	setKeyInfo