diff --git a/src/views/app.js b/src/views/app.js
index 579e57af6..ffc644538 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -1604,15 +1604,15 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
                     if (error) {
                         var errorMessage = error.message.toLowerCase();
-                        if (error.statusCode === 409) {
-                            if (errorMessage.indexOf('port') !== -1) {
-                                $scope.clone.error.port = error.message;
-                            } else if (error.message.indexOf('location') !== -1) {
-                                $scope.clone.error.location = 'This location is already taken.';
-                                $('#cloneLocationInput').focus();
+                        if (errorMessage.indexOf('port') !== -1) {
+                            $scope.clone.error.port = error.message;
+                        } else if (error.message.indexOf('location') !== -1) {
+                            if (errorMessage.indexOf('primary') !== -1) {
+                                $scope.clone.error.location = error.message;
                             } else {
-                                Client.error(error);
+                                $scope.clone.error.secondaryDomain = error.message;
                             }
+                            $('#cloneLocationInput').focus();
                         } else {
                             Client.error(error);
                         }