diff --git a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/EmbeddableEntity.java b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/EmbeddableEntity.java
index 5a54028..8ce5870 100644
--- a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/EmbeddableEntity.java
+++ b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/EmbeddableEntity.java
@@ -324,7 +324,7 @@
 	 */
 	@Override
 	protected final Element addSelf(String elementName) {
-		return addChild(getParent(), elementName, index);
+		return addChild(getParent(), elementName, index, getParent().getElementNamesOrder());
 	}
 
 	/**
diff --git a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java
index 9db77d7..a70fd27 100644
--- a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java
+++ b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java
@@ -162,6 +162,9 @@
 	 */
 	@Override
 	public ExternalEntity addEntity(String entityClassName) {
+		if (entityClassName == null) {
+			System.err.println();
+		}
 		Entity entity = buildEntity(entitiesSize());
 		entity.addSelf();
 		entity.setClassName(entityClassName);