diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js
index 8618093..78006c2 100644
--- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js
+++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js
@@ -259,10 +259,13 @@ const getAddCompositePkScriptDtos = collection => {
 	return newPrimaryKeys
 		.map(newPk => {
 			const ddlConfig = getCreateCompositePKDDLProviderConfig(newPk, entityName, collection);
+			if (_.isEmpty(ddlConfig.columns)) {
+				return null;
+			}
 			const statementDto = alterKeyConstraint(fullTableName, isCollectionActivated, ddlConfig);
 			return new KeyScriptModificationDto(statementDto.statement, fullTableName, false, statementDto.isActivated);
 		})
-		.filter(scriptDto => Boolean(scriptDto.script));
+		.filter(scriptDto => Boolean(scriptDto?.script));
 };
 
 /**
diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js
index 058baaa..a30f680 100644
--- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js
+++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js
@@ -277,10 +277,13 @@ const getAddCompositeUniqueKeyScriptDtos = (collection, dbVersion) => {
 				collection,
 				dbVersion,
 			);
+			if (_.isEmpty(ddlConfig.columns)) {
+				return null;
+			}
 			const statementDto = alterKeyConstraint(fullTableName, isCollectionActivated, ddlConfig);
 			return new KeyScriptModificationDto(statementDto.statement, fullTableName, false, statementDto.isActivated);
 		})
-		.filter(scriptDto => Boolean(scriptDto.script));
+		.filter(scriptDto => Boolean(scriptDto?.script));
 };
 
 /**
diff --git a/forward_engineering/ddlProvider/ddlHelpers/constraintsHelper.js b/forward_engineering/ddlProvider/ddlHelpers/constraintsHelper.js
index a370b6e..5cf2c93 100644
--- a/forward_engineering/ddlProvider/ddlHelpers/constraintsHelper.js
+++ b/forward_engineering/ddlProvider/ddlHelpers/constraintsHelper.js
@@ -150,7 +150,7 @@ const alterKeyConstraint = (tableName, isParentActivated, keyData) => {
 	const constraintStatementDto = createKeyConstraint(templates, isParentActivated)(keyData);
 	return {
 		statement: assignTemplates(templates.addPkConstraint, {
-			constraintStatement: (constraintStatementDto.statement || '').trim(),
+			constraintStatement: constraintStatementDto.statement.trim(),
 			tableName,
 		}),
 		isActivated: constraintStatementDto.isActivated,