From 3cf17d1073ebcd689bbd983f1bfd4be35643fd86 Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Wed, 31 Jan 2024 11:27:50 -0800
Subject: [PATCH] [PM-5936] Add additional null organization checks (#7707)

---
 .../vault/org-vault/vault-header/vault-header.component.html  | 4 ++--
 .../vault/org-vault/vault-header/vault-header.component.ts    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html
index 08dd28dc607..1d65ae53d68 100644
--- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html
+++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html
@@ -85,7 +85,7 @@
   </div>
 
   <div *ngIf="filter.type !== 'trash' && filter.collectionId !== Unassigned" class="tw-shrink-0">
-    <div *ngIf="organization.canCreateNewCollections" appListDropdown>
+    <div *ngIf="organization?.canCreateNewCollections" appListDropdown>
       <button
         bitButton
         buttonType="primary"
@@ -108,7 +108,7 @@
       </bit-menu>
     </div>
     <button
-      *ngIf="!organization.canCreateNewCollections"
+      *ngIf="!organization?.canCreateNewCollections"
       type="button"
       bitButton
       buttonType="primary"
diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
index 5b63ae4b8ea..aa3ae5bc344 100644
--- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
@@ -77,7 +77,7 @@ export class VaultHeaderComponent {
       return this.i18nService.t("unassigned");
     }
 
-    return `${this.organization.name} ${headerType}`;
+    return `${this.organization?.name} ${headerType}`;
   }
 
   protected get showBreadcrumbs() {