diff --git a/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js b/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js
index 509751b7..d17b1861 100644
--- a/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js
+++ b/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js
@@ -285,9 +285,9 @@ const getAddCompositePkScriptDtos = (app, _, ddlProvider) => collection => {
 	const { fullTableName } = getCollectionNames(_, collection);
 
 	return newPrimaryKeys
-		.map(newPk => {
-			const keyData = getCompositePrimaryKeys({ ...collection, ...(collection?.role || {}) }, true)[0];
-
+		.map(_ => getCompositePrimaryKeys({ ...collection, ...(collection?.role || {}) }, true)[0])
+		.filter(Boolean)
+		.map(keyData => {
 			const statementDto = ddlProvider.addPKConstraint(
 				fullTableName,
 				collection.isActivated,
diff --git a/forward_engineering/helpers/alterScriptHelpers/entityHelpers/uniqueConstraintHelper.js b/forward_engineering/helpers/alterScriptHelpers/entityHelpers/uniqueConstraintHelper.js
index f5b5429d..78ae69ff 100644
--- a/forward_engineering/helpers/alterScriptHelpers/entityHelpers/uniqueConstraintHelper.js
+++ b/forward_engineering/helpers/alterScriptHelpers/entityHelpers/uniqueConstraintHelper.js
@@ -94,13 +94,9 @@ const getAddCompositeUKScriptDtos = (app, _, ddlProvider) => collection => {
 	const { fullTableName } = getCollectionNames(_, collection);
 
 	return newUniqueConstraints
-		.map(newConstraint => {
-			const keyData = getCompositeUniqueKeys({ ...collection, ...(collection?.role || {}) }, true)[0];
-
-			if (!keyData) {
-				return null;
-			}
-
+		.map(_ => getCompositeUniqueKeys({ ...collection, ...(collection?.role || {}) }, true)[0])
+		.filter(Boolean)
+		.map(keyData => {
 			const statementDto = ddlProvider.addUniqueConstraint(
 				fullTableName,
 				collection.isActivated,
@@ -116,7 +112,7 @@ const getAddCompositeUKScriptDtos = (app, _, ddlProvider) => collection => {
 				statementDto.isActivated,
 			);
 		})
-		.filter(scriptDto => Boolean(scriptDto?.script));
+		.filter(scriptDto => Boolean(scriptDto.script));
 };
 
 /**