diff --git a/awx/ui/static/js/app.js b/awx/ui/static/js/app.js
index 3b2a98fdbf..71aae69986 100644
--- a/awx/ui/static/js/app.js
+++ b/awx/ui/static/js/app.js
@@ -413,7 +413,7 @@ angular.module('Tower', [
         function ($compile, $cookieStore, $rootScope, $log, CheckLicense, $location, Authorization, LoadBasePaths, ViewLicense,
             Timer, ClearScope, HideStream, Socket, LoadConfig) {
 
-            var e, html, sock, checkCount;
+            var e, html, sock, checkCount = 0;
 
             function detectBrowser() {
                 var ua = window.navigator.userAgent,
@@ -586,7 +586,7 @@ angular.module('Tower', [
                     else {
                         checkCount = 0;
                     }
-                }, 3000);
+                }, 5000);
             });
 
             LoadConfig();
diff --git a/awx/ui/static/lib/ansible/RestServices.js b/awx/ui/static/lib/ansible/RestServices.js
index efcd546aa4..fecb71d4fd 100644
--- a/awx/ui/static/lib/ansible/RestServices.js
+++ b/awx/ui/static/lib/ansible/RestServices.js
@@ -17,7 +17,7 @@ angular.module('RestServices', ['ngCookies', 'AuthService'])
                     this.url = url;
                 },
                 checkExpired: function () {
-                    return $rootScope.sessionTimer.isExpired();
+                    return ($rootScope.sessionTimer) ? $rootScope.sessionTimer.isExpired() : false;
                 },
                 pReplace: function () {
                     //in our url, replace :xx params with a value, assuming
diff --git a/awx/ui/static/lib/ansible/directives.js b/awx/ui/static/lib/ansible/directives.js
index e72fbc2b5f..3b23d9c83c 100644
--- a/awx/ui/static/lib/ansible/directives.js
+++ b/awx/ui/static/lib/ansible/directives.js
@@ -233,7 +233,7 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
      */
     .directive('awToolTip', function() {
         return function(scope, element, attrs) {
-            var delay = (attrs.delay !== undefined && attrs.delay !== null) ? attrs.delay : $AnsibleConfig.tooltip_delay,
+            var delay = (attrs.delay !== undefined && attrs.delay !== null) ? attrs.delay : ($AnsibleConfig) ? $AnsibleConfig.tooltip_delay : {show: 500, hide: 100},
                 placement;
             if (attrs.awTipPlacement) {
                 placement = attrs.awTipPlacement;