diff --git a/static/js/app.js b/static/js/app.js
index 8d6869978..9c701d62a 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -84,7 +84,7 @@ function createOrganizationTeam(ApiService, orgname, teamname, callback) {
     'teamname': teamname
   };
   
-  ApiService.updateOrganizationTeam(data, params).then(callback, function() {
+  ApiService.updateOrganizationTeam(data, params).then(callback, function(resp) {
     bootbox.dialog({
       "message": resp.data ? resp.data : 'The team could not be created',
       "title": "Cannot create team",
diff --git a/static/js/controllers.js b/static/js/controllers.js
index e44e3447b..d9684cbdc 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -4,11 +4,16 @@ $.fn.clipboardCopy = function() {
   clip.on('complete', function() {
     // Resets the animation.
     var elem = $('#clipboardCopied')[0];
+    if (!elem) {
+      return;
+    }
+
     elem.style.display = 'none';
     elem.classList.remove('animated');
 
     // Show the notification.
     setTimeout(function() {
+      if (!elem) { return; }
       elem.style.display = 'inline-block';
       elem.classList.add('animated');
     }, 10);
@@ -1016,7 +1021,6 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
     $scope.currentParentEntry = null;
 
     $scope.currentBuild = build;
-    $scope.currentBuildIndex = index;
 
     if (opt_updateURL) {
       if (build) {
@@ -1094,8 +1098,18 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
     ApiService.getRepoBuildStatus(null, params, true).then(function(resp) {
       // Note: We use extend here rather than replacing as Angular is depending on the
       // root build object to remain the same object.
-      $.extend(true, $scope.builds[$scope.currentBuildIndex], resp);
-      var currentBuild = $scope.builds[$scope.currentBuildIndex];
+      var matchingBuilds = $.grep($scope.builds, function(elem) {
+        return elem['id'] == resp['id']
+      });
+
+      var currentBuild = matchingBuilds.length > 0 ? matchingBuilds[0] : null;
+      if (currentBuild) {
+        currentBuild = $.extend(true, currentBuild, resp);
+      } else {
+        currentBuild = resp;
+        $scope.builds.push(currentBuild);
+      }
+
       checkPollTimer();
 
       // Load the updated logs for the build.
@@ -1587,12 +1601,14 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
 
     $scope.cuser = jQuery.extend({}, user);
 
-    for (var i = 0; i < $scope.cuser.logins.length; i++) {
-      if ($scope.cuser.logins[i].service == 'github') {
-        var githubId = $scope.cuser.logins[i].service_identifier;
-        $http.get('https://api.github.com/user/' + githubId).success(function(resp) {
-          $scope.githubLogin = resp.login;
-        });
+    if ($scope.cuser.logins) {
+      for (var i = 0; i < $scope.cuser.logins.length; i++) {
+        if ($scope.cuser.logins[i].service == 'github') {
+          var githubId = $scope.cuser.logins[i].service_identifier;
+          $http.get('https://api.github.com/user/' + githubId).success(function(resp) {
+            $scope.githubLogin = resp.login;
+          });
+        }
       }
     }
   });