diff --git a/awx/ui/client/src/rest/interceptors.service.js b/awx/ui/client/src/rest/interceptors.service.js index 2564df40cd..5ef77a40f4 100644 --- a/awx/ui/client/src/rest/interceptors.service.js +++ b/awx/ui/client/src/rest/interceptors.service.js @@ -21,7 +21,7 @@ return config; }, responseError: function(rejection){ - if( !_.isEmpty(rejection.data.detail) && rejection.data.detail === "Maximum per-user sessions reached"){ + if( rejection.data && !_.isEmpty(rejection.data.detail) && rejection.data.detail === "Maximum per-user sessions reached"){ $rootScope.sessionTimer.expireSession('session_limit'); return $q.reject(rejection); } diff --git a/awx/ui/client/src/shared/Utilities.js b/awx/ui/client/src/shared/Utilities.js index 6146e3f499..de9bbf67b2 100644 --- a/awx/ui/client/src/shared/Utilities.js +++ b/awx/ui/client/src/shared/Utilities.js @@ -203,11 +203,11 @@ angular.module('Utilities', ['RestServices', 'Utilities', 'sanitizeFilter']) $rootScope.sessionTimer.expireSession('idle'); } $location.url('/login'); - } else if (data.non_field_errors) { + } else if (data && data.non_field_errors) { Alert('Error!', data.non_field_errors); - } else if (data.detail) { + } else if (data && data.detail) { Alert(defaultMsg.hdr, defaultMsg.msg + ' ' + data.detail); - } else if (data.__all__) { + } else if (data && data.__all__) { if (typeof data.__all__ === 'object' && Array.isArray(data.__all__)) { Alert('Error!', data.__all__[0]); }