diff --git a/static/js/app.js b/static/js/app.js
index f6c8be899..68531bcf4 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -1587,10 +1587,10 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
         }
 
         var page = kindInfo['page'];
-        if (typeof page != 'string') {
+        if (page != null && typeof page != 'string') {
           page = page(notification['metadata']);
         }
-        return page;
+        return page || '';
       };
 
       notificationService.getMessage = function(notification) {
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 667807b52..47e5a9a75 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -569,6 +569,8 @@ function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiServi
   };
 
   $scope.setImage = function(imageId, opt_updateURL) {
+    if (!$scope.images) { return; }
+    
     var image = null;
     for (var i = 0; i < $scope.images.length; ++i) {
       var currentImage = $scope.images[i];
diff --git a/static/js/graphing.js b/static/js/graphing.js
index 795904747..d1b3b92b5 100644
--- a/static/js/graphing.js
+++ b/static/js/graphing.js
@@ -262,6 +262,9 @@ ImageHistoryTree.prototype.draw = function(container) {
 
   // Update the dimensions of the tree.
   var dimensions = this.updateDimensions_();
+  if (!dimensions) {
+    return this;
+  }
 
   // Populate the tree.
   this.root_.x0 = dimensions.cw / 2;