diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index e2dbd5b..49f1c22 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -45,6 +45,7 @@ program
     const spinner = ora("Uploading screenshots").start();
     try {
       const result = await upload({
+        token: options.token,
         root: directory,
         buildName: options.buildName,
         files: options.files,
diff --git a/packages/core/src/config.test.ts b/packages/core/src/config.test.ts
index f3f1dd0..bfba129 100644
--- a/packages/core/src/config.test.ts
+++ b/packages/core/src/config.test.ts
@@ -27,4 +27,15 @@ describe("#createConfig", () => {
   it("throws with invalid commit", () => {
     expect(() => createConfig().validate()).toThrow("commit: Invalid commit");
   });
+
+  it("throws with invalid token", () => {
+    const config = createConfig();
+    config.load({
+      commit: "f16f980bd17cccfa93a1ae7766727e67950773d0",
+      token: "invalid",
+    });
+    expect(() => config.validate()).toThrow(
+      "token: Invalid Argos repository token (must be 40 characters)",
+    );
+  });
 });
diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
index d345b0e..0eeea54 100644
--- a/packages/core/src/config.ts
+++ b/packages/core/src/config.ts
@@ -23,7 +23,7 @@ const mustBeCommit = (value: any) => {
 
 const mustBeArgosToken = (value: any) => {
   if (value && value.length !== 40) {
-    throw new Error("Must be a valid Argos repository token");
+    throw new Error("Invalid Argos repository token (must be 40 characters)");
   }
 };