diff --git a/addon/controllers/project.js b/addon/controllers/project.js
index 4cd0ad97..3319e7b4 100644
--- a/addon/controllers/project.js
+++ b/addon/controllers/project.js
@@ -10,7 +10,7 @@ export default class ProjectController extends Controller {
   @service constructionProject;
 
   get activeProjectId() {
-    return Number(this.router.externalRouter.currentRoute.params.project_id);
+    return Number(this.router.externalRouter.currentRoute?.params.project_id);
   }
 
   get isLoading() {
@@ -20,8 +20,8 @@ export default class ProjectController extends Controller {
   get displayLandingPage() {
     return (
       !this.projects.value?.length &&
-      this.router.externalRouter.currentRoute.localName !== "new" &&
-      this.router.externalRouter.currentRoute.localName !== "errors"
+      this.router.externalRouter.currentRoute?.localName !== "new" &&
+      this.router.externalRouter.currentRoute?.localName !== "errors"
     );
   }