diff --git a/shared/rocroller/.jenkins/common.groovy b/shared/rocroller/.jenkins/common.groovy
index 6f40a2c5e98..7d42717c62a 100644
--- a/shared/rocroller/.jenkins/common.groovy
+++ b/shared/rocroller/.jenkins/common.groovy
@@ -215,17 +215,17 @@ def runPerformanceCommand (platform, project)
         sshBlock ->
         def rrperfSuite = platform.jenkinsLabel.contains('gfx12') ? "all_gfx120X" : "all"
 
+        // either a label or a parameter can block comparison to master branch
+        def masterCompare = !(
+            pullRequest.labels.any { it == "ci:no-build-master" || it == "ci:no-build-target" }
+        )
+        if (masterCompare && (params?."Build target branch for comparison" != null))
+        {
+            masterCompare = params."Build target branch for comparison"
+        }
 
         if (env.CHANGE_ID)
         {
-            // either a label or a parameter can block comparison to master branch
-            def masterCompare = !(
-                pullRequest.labels.any { it == "ci:no-build-master" || it == "ci:no-build-target" }
-            )
-            if (masterCompare && (params?."Build target branch for comparison" != null))
-            {
-                masterCompare = params."Build target branch for comparison"
-            }
             String masterCompareCommand
             if (masterCompare)
             {
@@ -260,8 +260,12 @@ def runPerformanceCommand (platform, project)
                     cat ./performance_build_${platform.gpu}/performance_${platform.gpu}/**/*.log >> performance_${platform.gpu}_logs.txt
 
                     #Get Master Results
-                    wget ${masterURL}/lastSuccessfulBuild/artifact/*zip*/archive.zip
-                    unzip archive.zip
+                    ARTIFACT_URL_PREFIX="${masterURL}/lastSuccessfulBuild/artifact"
+                    if wget \${ARTIFACT_URL_PREFIX}/*zip*/archive.zip; then
+                      unzip archive.zip
+                    else
+                      echo "WARNING: No lastSuccessfulBuild found at \${ARTIFACT_URL_PREFIX}"
+                    fi
 
                     if [ -f archive/*/*/performance_${platform.gpu}_last.zip ]; then
 
@@ -390,6 +394,8 @@ def runPerformanceCommand (platform, project)
         {
             def ARCHIVE_LIMIT = "101"
 
+            String masterCompareString = masterCompare ? "1" : "0"
+
             def command = """#!/usr/bin/env bash
                         set -ex
                         cd ${project.paths.project_build_prefix}/
@@ -397,8 +403,17 @@ def runPerformanceCommand (platform, project)
                         ${sshBlock}
 
                         #Get Master Results
-                        wget ${masterURL}/lastSuccessfulBuild/artifact/*zip*/archive.zip
-                        unzip archive.zip
+                        ARTIFACT_URL_PREFIX="${masterURL}/lastSuccessfulBuild/artifact"
+                        if wget \${ARTIFACT_URL_PREFIX}/*zip*/archive.zip; then
+                          unzip archive.zip
+                        else
+                          if [ "${masterCompareString}" == "1" ]; then
+                            echo "ERROR: No lastSuccessfulBuild found at \${ARTIFACT_URL_PREFIX}"
+                            exit 1
+                          else
+                            echo "WARNING: No lastSuccessfulBuild found at \${ARTIFACT_URL_PREFIX}"
+                          fi
+                        fi
 
                         #Run Performance Test
                         export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${project.paths.project_build_prefix}/build/"