diff --git a/static/directives/credentials-dialog.html b/static/directives/credentials-dialog.html
index b2bef307d..d5c45b42e 100644
--- a/static/directives/credentials-dialog.html
+++ b/static/directives/credentials-dialog.html
@@ -9,27 +9,27 @@
           <cor-tab-panel remember-cookie="quay.credentialsTab">
             <!-- Tabs -->
             <cor-tabs>
-              <cor-tab tab-active="true" tab-id="cred-secret-{{ :dialogID }}">
+              <cor-tab tab-active="true" tab-id="cred-secret-{{ ::dialogID }}">
                 <i class="fa" ng-class="entityIcon"></i> {{ secretTitle }}
               </cor-tab>
 
-              <cor-tab tab-id="cred-kubernetes-{{ :dialogID }}">
+              <cor-tab tab-id="cred-kubernetes-{{ ::dialogID }}">
                 <i class="fa kubernetes-icon icon"></i> Kubernetes Secret
               </cor-tab>
 
-              <cor-tab tab-id="cred-rkt-{{ :dialogID }}">
+              <cor-tab tab-id="cred-rkt-{{ ::dialogID }}">
                 <i class="fa rocket-icon icon"></i> rkt Configuration
               </cor-tab>
 
-              <cor-tab tab-id="cred-docker-login-{{ :dialogID }}">
+              <cor-tab tab-id="cred-docker-login-{{ ::dialogID }}">
                 <i class="fa docker-icon icon"></i> Docker Login
               </cor-tab>
 
-              <cor-tab tab-id="cred-docker-{{ :dialogID }}">
+              <cor-tab tab-id="cred-docker-{{ ::dialogID }}">
                 <i class="fa docker-icon icon"></i> Docker Configuration
               </cor-tab>
 
-              <cor-tab tab-id="cred-mesos-{{ :dialogID }}" quay-show="isDownloadSupported()">
+              <cor-tab tab-id="cred-mesos-{{ ::dialogID }}" quay-show="isDownloadSupported()">
                 <i class="fa mesos-icon icon"></i> Mesos Credentials
               </cor-tab>
             </cor-tabs>
@@ -41,7 +41,7 @@
                   <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
               </h3>
 
-              <cor-tab-pane id="cred-secret-{{ :dialogID }}">
+              <cor-tab-pane id="cred-secret-{{ ::dialogID }}">
                 <label>{{ secretTitle }}:</label>
                 <div class="copy-box" value="credentials.password"></div>
                 <div class="help-text">
@@ -51,7 +51,7 @@
                 <div ng-transclude/>
               </cor-tab-pane>
 
-              <cor-tab-pane id="cred-kubernetes-{{ :dialogID }}">
+              <cor-tab-pane id="cred-kubernetes-{{ ::dialogID }}">
                 <label>Step 1: Download secret</label>
                 <div class="action-text">First, download the Kubernetes pull secret for the {{ entityTitle }}:</div>
                 <ul class="action-bar">
@@ -85,7 +85,7 @@ spec:
                   </div>
               </cor-tab-pane>
 
-              <cor-tab-pane id="cred-mesos-{{ :dialogID }}">
+              <cor-tab-pane id="cred-mesos-{{ ::dialogID }}">
                 <label>Step 1: Download credentials bundle</label>
                 <div class="action-text">First, download the Docker credentials file as a bundle:</div>
                 <ul class="action-bar">
@@ -124,7 +124,7 @@ spec:
                 </div>
               </cor-tab-pane>
 
-              <cor-tab-pane id="cred-rkt-{{ :dialogID }}">
+              <cor-tab-pane id="cred-rkt-{{ ::dialogID }}">
                 <label>Step 1: Download credentials config</label>
                 <div class="action-text">First, download the rkt credentials file for the {{ entityTitle }}:</div>
                 <ul class="action-bar">
@@ -139,13 +139,13 @@ spec:
                 <div class="copy-box" value="'mv ' + getRktFilename(credentials) + ' /etc/rkt/auth.d/'"></div>
               </cor-tab-pane>
 
-              <cor-tab-pane id="cred-docker-login-{{ :dialogID }}">
+              <cor-tab-pane id="cred-docker-login-{{ ::dialogID }}">
                 <label>Run docker login</label>
                 <div class="action-text">Enter the following command on the command line:</div>
                 <div class="copy-box" value="getDockerLogin(credentials)"></div>
               </cor-tab-pane>
 
-              <cor-tab-pane id="cred-docker-{{ :dialogID }}">
+              <cor-tab-pane id="cred-docker-{{ ::dialogID }}">
                 <label>Step 1: Download credentials config</label>
                 <div class="action-text">First, download the Docker credentials file for the {{ entityTitle }}:</div>
                 <ul class="action-bar">
diff --git a/static/js/directives/ui/cor-tabs/cor-tab-panel.component.ts b/static/js/directives/ui/cor-tabs/cor-tab-panel.component.ts
index 834121f28..a427989f4 100644
--- a/static/js/directives/ui/cor-tabs/cor-tab-panel.component.ts
+++ b/static/js/directives/ui/cor-tabs/cor-tab-panel.component.ts
@@ -40,7 +40,9 @@ export class CorTabPanelComponent implements OnDestroy {
   }
 
   public ngOnDestroy(): void {
-    this.currentTabHandler.dispose();
+    if (this.currentTabHandler) {
+      this.currentTabHandler.dispose();
+    }
   }
 
   public tabClicked(tab: CorTabComponent): void {