diff --git a/visual-js/visual-snapshots/src/app/pdf-handler.ts b/visual-js/visual-snapshots/src/app/pdf-handler.ts
index 3aa4e98d..67a4002f 100644
--- a/visual-js/visual-snapshots/src/app/pdf-handler.ts
+++ b/visual-js/visual-snapshots/src/app/pdf-handler.ts
@@ -18,22 +18,27 @@ export class PdfCommandHandler {
     private readonly pdfSnapshotUploader: PdfSnapshotUploader
   ) {}
 
-  public async handle(globsOrDirs: string[], params: PdfCommandParams) {
+  public async handle(
+    globsOrDirs: string[],
+    params: PdfCommandParams
+  ): Promise<void> {
     const pdfFilePaths = await getFiles(globsOrDirs, "*.pdf");
 
     const buildId =
       params.buildId ?? (await this.visualSnapshotsApi.createBuild(params));
 
-    await this.pdfSnapshotUploader.uploadSnapshots({
-      buildId,
-      pdfFilePaths,
-      suiteName: params.suiteName,
-      testNameFormat: params.testName,
-      snapshotNameFormat: params.snapshotName,
-    });
-
-    if (!params.buildId) {
-      await this.visualSnapshotsApi.finishBuild(buildId);
+    try {
+      await this.pdfSnapshotUploader.uploadSnapshots({
+        buildId,
+        pdfFilePaths,
+        suiteName: params.suiteName,
+        testNameFormat: params.testName,
+        snapshotNameFormat: params.snapshotName,
+      });
+    } finally {
+      if (!params.buildId) {
+        await this.visualSnapshotsApi.finishBuild(buildId);
+      }
     }
   }
 }
diff --git a/visual-js/visual-snapshots/src/commands/pdf.ts b/visual-js/visual-snapshots/src/commands/pdf.ts
index d8772e25..5c85506b 100644
--- a/visual-js/visual-snapshots/src/commands/pdf.ts
+++ b/visual-js/visual-snapshots/src/commands/pdf.ts
@@ -68,10 +68,10 @@ export const pdfCommand = (clientVersion: string) => {
       new PdfCommandHandler(visualSnapshotsApi, pdfSnapshotUploader)
         .handle(globsOrDirs, params)
         .then(() => {
-          console.log("Successfully created PDF snapshots");
+          console.info("Successfully created PDF snapshots.");
         })
         .catch((err) => {
-          console.error(`An error occured when creating PDF snapshots: ${err}`);
+          console.error(`At least one PDF snapshot creation failed: ${err}.`);
         });
     });
 };