diff --git a/src/commands/confirm.command.ts b/src/commands/confirm.command.ts
index 3dbe7da760a..d6639e4c407 100644
--- a/src/commands/confirm.command.ts
+++ b/src/commands/confirm.command.ts
@@ -60,6 +60,6 @@ class Options {
   organizationId: string;
 
   constructor(passedOptions: Record<string, any>) {
-    this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
+    this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
   }
 }
diff --git a/src/commands/create.command.ts b/src/commands/create.command.ts
index 0451620c673..9ccdff41ceb 100644
--- a/src/commands/create.command.ts
+++ b/src/commands/create.command.ts
@@ -205,8 +205,8 @@ class Options {
   file: string;
 
   constructor(passedOptions: Record<string, any>) {
-    this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
-    this.itemId = passedOptions.itemid || passedOptions.itemId;
-    this.file = passedOptions.file;
+    this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
+    this.itemId = passedOptions?.itemid || passedOptions?.itemId;
+    this.file = passedOptions?.file;
   }
 }
diff --git a/src/commands/delete.command.ts b/src/commands/delete.command.ts
index a0354f9299a..35bba556743 100644
--- a/src/commands/delete.command.ts
+++ b/src/commands/delete.command.ts
@@ -127,8 +127,8 @@ class Options {
   permanent: boolean;
 
   constructor(passedOptions: Record<string, any>) {
-    this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
-    this.itemId = passedOptions.itemid || passedOptions.itemId;
-    this.permanent = CliUtils.convertBooleanOption(passedOptions.permanent);
+    this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
+    this.itemId = passedOptions?.itemid || passedOptions?.itemId;
+    this.permanent = CliUtils.convertBooleanOption(passedOptions?.permanent);
   }
 }
diff --git a/src/commands/edit.command.ts b/src/commands/edit.command.ts
index fa203000558..2622ee508e1 100644
--- a/src/commands/edit.command.ts
+++ b/src/commands/edit.command.ts
@@ -189,6 +189,6 @@ class Options {
   organizationId: string;
 
   constructor(passedOptions: Record<string, any>) {
-    this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
+    this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
   }
 }
diff --git a/src/commands/generate.command.ts b/src/commands/generate.command.ts
index f1b36887479..0f08b64a99d 100644
--- a/src/commands/generate.command.ts
+++ b/src/commands/generate.command.ts
@@ -43,16 +43,16 @@ class Options {
   includeNumber: boolean;
 
   constructor(passedOptions: Record<string, any>) {
-    this.uppercase = CliUtils.convertBooleanOption(passedOptions.uppercase);
-    this.lowercase = CliUtils.convertBooleanOption(passedOptions.lowercase);
-    this.number = CliUtils.convertBooleanOption(passedOptions.number);
-    this.special = CliUtils.convertBooleanOption(passedOptions.special);
-    this.capitalize = CliUtils.convertBooleanOption(passedOptions.capitalize);
-    this.includeNumber = CliUtils.convertBooleanOption(passedOptions.includeNumber);
-    this.length = passedOptions.length != null ? parseInt(passedOptions.length, null) : 14;
-    this.type = passedOptions.passphrase ? "passphrase" : "password";
-    this.separator = passedOptions.separator == null ? "-" : passedOptions.separator + "";
-    this.words = passedOptions.words != null ? parseInt(passedOptions.words, null) : 3;
+    this.uppercase = CliUtils.convertBooleanOption(passedOptions?.uppercase);
+    this.lowercase = CliUtils.convertBooleanOption(passedOptions?.lowercase);
+    this.number = CliUtils.convertBooleanOption(passedOptions?.number);
+    this.special = CliUtils.convertBooleanOption(passedOptions?.special);
+    this.capitalize = CliUtils.convertBooleanOption(passedOptions?.capitalize);
+    this.includeNumber = CliUtils.convertBooleanOption(passedOptions?.includeNumber);
+    this.length = passedOptions?.length != null ? parseInt(passedOptions?.length, null) : 14;
+    this.type = passedOptions?.passphrase ? "passphrase" : "password";
+    this.separator = passedOptions?.separator == null ? "-" : passedOptions.separator + "";
+    this.words = passedOptions?.words != null ? parseInt(passedOptions.words, null) : 3;
 
     if (!this.uppercase && !this.lowercase && !this.special && !this.number) {
       this.lowercase = true;
diff --git a/src/commands/get.command.ts b/src/commands/get.command.ts
index 453a9c94b88..25bbac1e6d3 100644
--- a/src/commands/get.command.ts
+++ b/src/commands/get.command.ts
@@ -542,8 +542,8 @@ class Options {
   output: string;
 
   constructor(passedOptions: Record<string, any>) {
-    this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
-    this.itemId = passedOptions.itemid || passedOptions.itemId;
-    this.output = passedOptions.output;
+    this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
+    this.itemId = passedOptions?.itemid || passedOptions?.itemId;
+    this.output = passedOptions?.output;
   }
 }
diff --git a/src/commands/list.command.ts b/src/commands/list.command.ts
index c4066bce986..c45024cdc09 100644
--- a/src/commands/list.command.ts
+++ b/src/commands/list.command.ts
@@ -249,11 +249,11 @@ class Options {
   trash: boolean;
 
   constructor(passedOptions: Record<string, any>) {
-    this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
-    this.collectionId = passedOptions.collectionid || passedOptions.collectionId;
-    this.folderId = passedOptions.folderid || passedOptions.folderId;
-    this.search = passedOptions.search;
-    this.url = passedOptions.url;
-    this.trash = CliUtils.convertBooleanOption(passedOptions.trash);
+    this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
+    this.collectionId = passedOptions?.collectionid || passedOptions?.collectionId;
+    this.folderId = passedOptions?.folderid || passedOptions?.folderId;
+    this.search = passedOptions?.search;
+    this.url = passedOptions?.url;
+    this.trash = CliUtils.convertBooleanOption(passedOptions?.trash);
   }
 }
diff --git a/src/commands/send/create.command.ts b/src/commands/send/create.command.ts
index c69ae81fd24..4c666cfedd6 100644
--- a/src/commands/send/create.command.ts
+++ b/src/commands/send/create.command.ts
@@ -141,11 +141,11 @@ class Options {
   hidden: boolean;
 
   constructor(passedOptions: Record<string, any>) {
-    this.file = passedOptions.file;
-    this.text = passedOptions.text;
-    this.password = passedOptions.password;
-    this.hidden = CliUtils.convertBooleanOption(passedOptions.hidden);
+    this.file = passedOptions?.file;
+    this.text = passedOptions?.text;
+    this.password = passedOptions?.password;
+    this.hidden = CliUtils.convertBooleanOption(passedOptions?.hidden);
     this.maxAccessCount =
-      passedOptions.maxAccessCount != null ? parseInt(passedOptions.maxAccessCount, null) : null;
+      passedOptions?.maxAccessCount != null ? parseInt(passedOptions.maxAccessCount, null) : null;
   }
 }
diff --git a/src/commands/send/edit.command.ts b/src/commands/send/edit.command.ts
index 388e62fee9f..ab70c345381 100644
--- a/src/commands/send/edit.command.ts
+++ b/src/commands/send/edit.command.ts
@@ -84,6 +84,6 @@ class Options {
   itemId: string;
 
   constructor(passedOptions: Record<string, any>) {
-    this.itemId = passedOptions.itemId || passedOptions.itemid;
+    this.itemId = passedOptions?.itemId || passedOptions?.itemid;
   }
 }
diff --git a/src/commands/send/list.command.ts b/src/commands/send/list.command.ts
index 97786d26827..28385270d24 100644
--- a/src/commands/send/list.command.ts
+++ b/src/commands/send/list.command.ts
@@ -32,6 +32,6 @@ class Options {
   search: string;
 
   constructor(passedOptions: Record<string, any>) {
-    this.search = passedOptions.search;
+    this.search = passedOptions?.search;
   }
 }
diff --git a/src/commands/sync.command.ts b/src/commands/sync.command.ts
index 1c20f629a46..506f9b62546 100644
--- a/src/commands/sync.command.ts
+++ b/src/commands/sync.command.ts
@@ -36,7 +36,7 @@ class Options {
   force: boolean;
 
   constructor(passedOptions: Record<string, any>) {
-    this.last = CliUtils.convertBooleanOption(passedOptions.last);
-    this.force = CliUtils.convertBooleanOption(passedOptions.force);
+    this.last = CliUtils.convertBooleanOption(passedOptions?.last);
+    this.force = CliUtils.convertBooleanOption(passedOptions?.force);
   }
 }
diff --git a/src/commands/unlock.command.ts b/src/commands/unlock.command.ts
index 9d527ad6764..9c0f0a05294 100644
--- a/src/commands/unlock.command.ts
+++ b/src/commands/unlock.command.ts
@@ -152,7 +152,7 @@ class Options {
   passwordFile: string;
 
   constructor(passedOptions: Record<string, any>) {
-    this.passwordEnv = passedOptions.passwordenv || passedOptions.passwordEnv;
-    this.passwordFile = passedOptions.passwordfile || passedOptions.passwordFile;
+    this.passwordEnv = passedOptions?.passwordenv || passedOptions?.passwordEnv;
+    this.passwordFile = passedOptions?.passwordfile || passedOptions?.passwordFile;
   }
 }
diff --git a/src/program.ts b/src/program.ts
index 2fa4b04a11b..850e79fe810 100644
--- a/src/program.ts
+++ b/src/program.ts
@@ -480,6 +480,7 @@ export class Program extends BaseProgram {
         writeLn("", true);
       })
       .action(async (cmd) => {
+        await this.exitIfNotAuthed();
         const command = new ServeCommand(this.main);
         await command.run(cmd);
       });