diff --git a/src/views/app.js b/src/views/app.js
index 7d973b497..9e22859df 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -451,17 +451,19 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
                 Client.configureApp($scope.app.id, 'location', data, function (error) {
                     if (error && (error.statusCode === 409 || error.statusCode === 400)) {
-                        if ((error.subdomain && error.domain) || error.field === 'location') {
-                            if (data.domain === error.domain && data.subdomain === error.subdomain) { // the primary
+                        if (error.message.indexOf('location') !== -1) {
+                            if (error.message.indexOf('primary') !== -1) {
                                 $scope.location.error.location = error.message;
                                 $scope.locationForm.$setPristine();
-                            } else { // FIXME: check error in aliasDomains
+                            } else if (error.message.indexOf('secondary') !== -1) {
+                                $scope.location.error.secondaryDomain = error.message;
+                            } else if (error.message.indexOf('redirect') !== -1) {
                                 $scope.location.error.redirectDomains = error.message;
+                            } else if (error.message.indexOf('alias') !== -1) {
+                                $scope.location.error.aliasDomains = error.message;
                             }
-                        } else if (error.portName || error.field === 'portBindings') {
+                        } else if (error.message.indexOf('portBinding') !== -1) {
                             $scope.location.error.port = error.message;
-                        } else if (error.message.indexOf('secondaryDomain') !== -1) {
-                            $scope.location.error.secondaryDomain = error.message;
                         }
 
                         $scope.location.busy = false;
diff --git a/src/views/appstore.js b/src/views/appstore.js
index 40c2d514b..b2a3c55be 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -298,7 +298,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
                                 $scope.appInstall.error.other = error.message;
                             }
                         } else if (error.statusCode === 400) {
-                            if (error.field === 'cert') {
+                            if (error.message.indexOf('cert') !== -1) {
                                 $scope.appInstall.error.cert = error.message;
                                 $scope.appInstall.certificateFileName = '';
                                 $scope.appInstall.certificateFile = null;