diff --git a/.github/actions/auto-approve-deployments/action.yml b/.github/actions/auto-approve-deployments/action.yml
index 4809e09..d5b2db2 100644
--- a/.github/actions/auto-approve-deployments/action.yml
+++ b/.github/actions/auto-approve-deployments/action.yml
@@ -23,9 +23,10 @@ runs:
       env:
         GH_TOKEN: ${{ inputs.github_token }}
         ENVIRONMENT_ALLOW_LIST: ${{ inputs.environment_allow_list }}
+        SELF_JOB_NAME: ${{ inputs.self_job_name }}
       run: |
         ${{ github.action_path }}/poll-and-approve.ps1 `
           -Repo '${{ github.repository }}' `
           -RunId ${{ github.run_id }} `
           -EnvironmentAllowList ($env:ENVIRONMENT_ALLOW_LIST | ConvertFrom-Json) `
-          -SelfJobName '${{ inputs.self_job_name }}'
+          -SelfJobName $env:SELF_JOB_NAME
diff --git a/.github/actions/auto-approve-deployments/poll-and-approve.ps1 b/.github/actions/auto-approve-deployments/poll-and-approve.ps1
index 604b35a..b4d89a6 100644
--- a/.github/actions/auto-approve-deployments/poll-and-approve.ps1
+++ b/.github/actions/auto-approve-deployments/poll-and-approve.ps1
@@ -60,7 +60,7 @@ while ($elapsed -lt $MaxWaitSeconds) {
     }
 
     # Approve any pending deployments whose environment name matches the allow list.
-    $allowedEnvIds = @($pending | Where-Object { $EnvironmentAllowList -contains $_.environment.name } | ForEach-Object { $_.environment.id })
+    $allowedEnvIds = @($pending | Where-Object { $_.environment -and $_.environment.name -and ($EnvironmentAllowList -contains $_.environment.name) } | ForEach-Object { $_.environment.id })
 
     if ($allowedEnvIds.Count -gt 0) {
         Write-Host "Approving pending deployments (ids: $($allowedEnvIds -join ','))"