diff --git a/src/js/client.js b/src/js/client.js
index a4f1cf49b..0dc0984ac 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1734,6 +1734,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         get('/api/v1/domains/' + domain + '/dns?subdomain=' + subdomain + '&type=' + type, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
+            if (data.error) return callback(new ClientError(status, data.error));
 
             callback(null, data.values);
         });
diff --git a/src/views/app.js b/src/views/app.js
index 04f726809..c7da2652d 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -241,7 +241,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 if (overwriteDns) return callback();
 
                 Client.getDNSRecords(domain.domain, domain.subdomain, 'A', function (error, result) {
-                    if (error && error.statusCode === 424) {
+                    if (error && (error.statusCode === 424 || error.statusCode === 200)) {
                         if (data.domain === domain.domain && data.location === domain.subdomain) {
                             $scope.location.error.location = domain.domain + ' ' + error.message;
                         } else {