diff --git a/app/scripts/directives/oscSourceSecrets.js b/app/scripts/directives/oscSourceSecrets.js
index 60b3b63cfe..f707748104 100644
--- a/app/scripts/directives/oscSourceSecrets.js
+++ b/app/scripts/directives/oscSourceSecrets.js
@@ -21,9 +21,9 @@ angular.module("openshiftConsole")
           var lastSecret = _.last($scope.pickedSecrets);
           switch ($scope.strategyType) {
           case 'Custom':
-            return lastSecret.secretSource.name;
+            return _.get(lastSecret, 'secretSource.name');
           default:
-            return lastSecret.secret.name;
+            return _.get(lastSecret, 'secret.name');
           }
         };
 
diff --git a/app/views/edit/build-config.html b/app/views/edit/build-config.html
index 51e5f2f944..8833db3f64 100644
--- a/app/views/edit/build-config.html
+++ b/app/views/edit/build-config.html
@@ -347,8 +347,10 @@ <h3 class="with-divider">Image Configuration</h3>
                           </div>
                         </div>
 
-                        <div class="form-group" ng-if="strategyType !== 'JenkinsPipeline'">
-                          <!-- Use ng-show instead of ng-if so the form is still marked invalid if a hidden field has errors. -->
+                        <!-- Wait for project to load since the directive uses `canI` checks that need it. -->
+                        <div class="form-group" ng-if="project && strategyType !== 'JenkinsPipeline'">
+                          <!-- Use ng-show instead of ng-if when checking `view.advancedOptions` so
+                               the form is still marked invalid if a hidden field has errors. -->
                           <div ng-show="view.advancedOptions">
                             <osc-secrets model="secrets.picked.pullSecret"
                                         namespace="projectName"
@@ -401,19 +403,21 @@ <h3 class="with-divider">Image Configuration</h3>
                             </div>
                           </div>
 
-                          <!-- Use ng-show instead of ng-if so the form is still marked invalid if a hidden field has errors. -->
-                          <div class="form-group" ng-show="view.advancedOptions">
-                            <osc-secrets model="secrets.picked.pushSecret"
-                                        namespace="projectName"
-                                        display-type="push"
-                                        type="image"
-                                        disable-input="imageOptions.to.type==='None'"
-                                        service-account-to-link="builder"
-                                        secrets-by-type="secrets.secretsByType"
-                                        alerts="alerts">
-                            </osc-secrets>
+                          <!-- Wait for project to load since the directive uses `canI` checks that need it. -->
+                          <div ng-if="project">
+                            <!-- Use ng-show instead of ng-if so the form is still marked invalid if a hidden field has errors. -->
+                            <div class="form-group" ng-show="view.advancedOptions">
+                              <osc-secrets model="secrets.picked.pushSecret"
+                                          namespace="projectName"
+                                          display-type="push"
+                                          type="image"
+                                          disable-input="imageOptions.to.type==='None'"
+                                          service-account-to-link="builder"
+                                          secrets-by-type="secrets.secretsByType"
+                                          alerts="alerts">
+                              </osc-secrets>
+                            </div>
                           </div>
-
                         </div>
                       </dl>
                     </div>
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index e1d4f89047..c73c88549f 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -10783,10 +10783,10 @@ b.canAddSourceSecret = function() {
 var a = _.last(b.pickedSecrets);
 switch (b.strategyType) {
 case "Custom":
-return a.secretSource.name;
+return _.get(a, "secretSource.name");
 
 default:
-return a.secret.name;
+return _.get(a, "secret.name");
 }
 }, b.setLastSecretsName = function(a) {
 var c = _.last(b.pickedSecrets);
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 2aa9798f54..043626f012 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -9271,7 +9271,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<div class=\"form-group\" ng-if=\"strategyType !== 'JenkinsPipeline'\">\n" +
+    "\n" +
+    "<div class=\"form-group\" ng-if=\"project && strategyType !== 'JenkinsPipeline'\">\n" +
     "\n" +
     "<div ng-show=\"view.advancedOptions\">\n" +
     "<osc-secrets model=\"secrets.picked.pullSecret\" namespace=\"projectName\" display-type=\"pull\" type=\"image\" secrets-by-type=\"secrets.secretsByType\" service-account-to-link=\"builder\" alerts=\"alerts\">\n" +
@@ -9306,11 +9307,14 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "\n" +
+    "<div ng-if=\"project\">\n" +
+    "\n" +
     "<div class=\"form-group\" ng-show=\"view.advancedOptions\">\n" +
     "<osc-secrets model=\"secrets.picked.pushSecret\" namespace=\"projectName\" display-type=\"push\" type=\"image\" disable-input=\"imageOptions.to.type==='None'\" service-account-to-link=\"builder\" secrets-by-type=\"secrets.secretsByType\" alerts=\"alerts\">\n" +
     "</osc-secrets>\n" +
     "</div>\n" +
     "</div>\n" +
+    "</div>\n" +
     "</dl>\n" +
     "</div>\n" +
     "<div ng-if=\"!(updatedBuildConfig | isJenkinsPipelineStrategy)\" class=\"section\">\n" +