diff --git a/packages/salesforce/src/deploy/retrieveResultPackage.ts b/packages/salesforce/src/deploy/retrieveResultPackage.ts
index b49de2da..a86a4b81 100644
--- a/packages/salesforce/src/deploy/retrieveResultPackage.ts
+++ b/packages/salesforce/src/deploy/retrieveResultPackage.ts
@@ -186,7 +186,7 @@ export class RetrieveResultPackage {
      * Returns true if the retrieve was successful and an archive with the retriebe result is available.
      */
     public get success(): boolean {
-        return !!this.result.zipFile;
+        return this.archives !== undefined;
     }
 
     /**
diff --git a/packages/vscode-extension/src/commands/metadata/retrieveMetadataCommand.ts b/packages/vscode-extension/src/commands/metadata/retrieveMetadataCommand.ts
index 2737fcf9..114331ea 100644
--- a/packages/vscode-extension/src/commands/metadata/retrieveMetadataCommand.ts
+++ b/packages/vscode-extension/src/commands/metadata/retrieveMetadataCommand.ts
@@ -118,12 +118,13 @@ export default class RetrieveMetadataCommand extends MetadataCommand {
                 throw new Error('No metadata retrieved from target org.');
             }
 
+            if (this.vlocode.config.salesforce.exportFormat === 'sfdx') {
+                void vscode.window.showWarningMessage('Decomposing metadata into SFDX format is currently not supported.');
+            }
+
             const unpackedFiles = new Array<string>();
             for (const file of result.getFiles()) {
                 try {
-                    if (this.vlocode.config.salesforce.exportFormat === 'sfdx') {
-                        void vscode.window.showWarningMessage('Decomposing metadata into SFDX format is currently not supported.');
-                    }
                     const unpackTarget = path.join(vscode.workspace.workspaceFolders?.[0].uri.fsPath ?? '.', this.vlocode.config.salesforce.exportFolder);
                     await file.writeFile(unpackTarget);
                     this.logger.log(`Exported ${file.archivePath}`);