diff --git a/create-deployment.js b/create-deployment.js
index 99898f1..d69ae28 100644
--- a/create-deployment.js
+++ b/create-deployment.js
@@ -138,7 +138,16 @@ exports.createDeployment = async function(applicationName, fullRepositoryName, b
             break;
         } catch (e) {
             if (e.code == 'DeploymentLimitExceededException') {
-                var [, otherDeployment] = e.message.toString().match(/is already deploying deployment \'(d-\w+)\'/);
+                let message = e.message.toString();
+                let found = message.match(/(?:is already deploying|already has an active Deployment) \'(d-\w+)\'/);
+
+                if (!found) {
+                    console.log(`🐞 Unexpected exception message: ${message}`);
+                    core.setFailed('Aborting');
+                    throw e;
+                }
+
+                let [, otherDeployment] = found;
                 console.log(`😶 Waiting for another pending deployment ${otherDeployment}`);
                 try {
                     await codeDeploy.waitFor('deploymentSuccessful', {deploymentId: otherDeployment}).promise();
diff --git a/dist/index.js b/dist/index.js
index 2ae29bf..a3466e7 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -154,7 +154,16 @@ exports.createDeployment = async function(applicationName, fullRepositoryName, b
             break;
         } catch (e) {
             if (e.code == 'DeploymentLimitExceededException') {
-                var [, otherDeployment] = e.message.toString().match(/is already deploying deployment \'(d-\w+)\'/);
+                let message = e.message.toString();
+                let found = message.match(/(?:is already deploying|already has an active Deployment) \'(d-\w+)\'/);
+
+                if (!found) {
+                    console.log(`🐞 Unexpected exception message: ${message}`);
+                    core.setFailed('Aborting');
+                    throw e;
+                }
+
+                let [, otherDeployment] = found;
                 console.log(`😶 Waiting for another pending deployment ${otherDeployment}`);
                 try {
                     await codeDeploy.waitFor('deploymentSuccessful', {deploymentId: otherDeployment}).promise();