diff --git a/action.yml b/action.yml
index db929d2..fa8706f 100644
--- a/action.yml
+++ b/action.yml
@@ -91,11 +91,10 @@ runs:
       if: inputs.comment-on-pr == 'true' && steps.pr-number.outputs.pr-number != ''
       env:
         ARTIFACT_NAME: ${{ inputs.artifact-name }}
-        BASE_BRANCH: ${{ inputs.base-branch }}
+        PR_ID: ${{ steps.pr-number.outputs.pr-number }}
         COMMENT_ID: ${{ steps.find-comment.outputs.comment-id }}
         DO_COMPARISON: ${{ inputs.do-comparison }}
-        JOB_NAME: ${{ inputs.job-name }}
-        PR_ID: ${{ steps.pr-number.outputs.pr-number }}
+        BASE_BRANCH: ${{ inputs.base-branch }}
       run: |
         . "$GITHUB_ACTION_PATH/scripts/utils.sh"
 
diff --git a/scripts/retrieve-old-report.sh b/scripts/retrieve-old-report.sh
index 06b13bf..4de1899 100755
--- a/scripts/retrieve-old-report.sh
+++ b/scripts/retrieve-old-report.sh
@@ -41,8 +41,10 @@ has_report() {
 base_branch=${BASE_BRANCH:-$(default_branch)}
 
 if in_private_repo; then
-  warn 'Detected that this is a private repo cannot retrieve old report'
-elif [ "$JOB_NAME" ]; then
+  warn 'Detected that this is a private repo, retrieving the old report will probably fail'
+fi
+
+if ! in_private_repo && [ "$JOB_NAME" ]; then
   url=$(base_report_url "$base_branch")
 
   log "Found previous run at: $url"
@@ -58,8 +60,6 @@ elif [ "$JOB_NAME" ]; then
     exit 0
   fi
   error "Failed to find previous report, expected at: $report_url"
-else
-  panic 'job-name is missing, therefore we cannot find the previous report'
 fi
 
 warn "Couldn't retrieve old report: