diff --git a/web_client/src/components/ProjectUsers.vue b/web_client/src/components/ProjectUsers.vue
index 2b07f0c1..4aa24108 100644
--- a/web_client/src/components/ProjectUsers.vue
+++ b/web_client/src/components/ProjectUsers.vue
@@ -28,10 +28,10 @@ export default defineComponent({
     const collaborators = computed(
       () => currentProject.value.settings.permissions.collaborator as User[],
     );
-    const members = computed(() => [
+    const members = computed(() => (currentProject.value?.settings?.permissions ? [
       ...currentProject.value.settings.permissions.tier_1_reviewer,
       ...currentProject.value.settings.permissions.tier_2_reviewer,
-    ] as User[]);
+    ] as User[] : []));
     const emailOptions = computed(() => members.value.concat(collaborators.value).map(
       (u: User) => u.email,
     ));
@@ -285,6 +285,7 @@ export default defineComponent({
         :dark="false"
       >
         <v-card
+          v-if="selectedPermissionSet"
           class="dialog-box"
         >
           <v-btn
diff --git a/web_client/src/views/Projects.vue b/web_client/src/views/Projects.vue
index 5c6770ae..e399be26 100644
--- a/web_client/src/views/Projects.vue
+++ b/web_client/src/views/Projects.vue
@@ -118,9 +118,7 @@ export default defineComponent({
       }
     }
     function selectProject(project: Project) {
-      if (complete) {
-        complete = false;
-      }
+      complete = false;
       store.dispatch('loadProject', project);
     }
     async function createProject() {
@@ -152,7 +150,7 @@ export default defineComponent({
           while (
             (!nextScan
             || (nextScanState === 'complete' && reviewMode.value))
-            && nextProject.experiments[0].scans
+            && nextProject.experiments[0]?.scans
             && nextScanIndex < nextProject.experiments[0].scans.length
           ) {
             nextScan = nextProject.experiments[0].scans[nextScanIndex];
@@ -372,7 +370,7 @@ export default defineComponent({
           fill-height
         >
           <div
-            v-if="complete"
+            v-if="complete && currentProject"
             class="text-h6 text-center"
           >
             Viewed all scans in Project {{ currentProject.name }}.