diff --git a/.github/workflows/document.yaml b/.github/workflows/document.yaml
index cad6c14..3ba0042 100644
--- a/.github/workflows/document.yaml
+++ b/.github/workflows/document.yaml
@@ -51,7 +51,7 @@ jobs:
           git remote set-url origin https://$GITHUB_ACTOR:${{ secrets.GH_PAT }}@github.com/$GITHUB_REPOSITORY.git
           git stash
           git pull --rebase origin ${{ inputs.branch_name }}
-          git stash pop
+          git stash list | grep stash@{0} && git stash pop || echo "No stash to pop"
           git add man/\* NAMESPACE DESCRIPTION
           git commit -m "docs: update documentation" || echo "No changes to commit"
           git push origin ${{ inputs.branch_name }}
diff --git a/.github/workflows/render-readme.yaml b/.github/workflows/render-readme.yaml
index 6ccbcd6..de04968 100644
--- a/.github/workflows/render-readme.yaml
+++ b/.github/workflows/render-readme.yaml
@@ -65,6 +65,6 @@ jobs:
           git remote set-url origin https://$GITHUB_ACTOR:${{ secrets.GH_PAT }}@github.com/$GITHUB_REPOSITORY.git
           git stash
           git pull --rebase origin ${{ inputs.branch_name }}
-          git stash pop
+          git stash list | grep stash@{0} && git stash pop || echo "No stash to pop"
           git commit README.md -m 'docs(README): Re-build README.Rmd' || echo "No changes to commit"
           git push origin ${{ inputs.branch_name }}
diff --git a/.github/workflows/update-lockfile.yaml b/.github/workflows/update-lockfile.yaml
index 63d3363..0186813 100644
--- a/.github/workflows/update-lockfile.yaml
+++ b/.github/workflows/update-lockfile.yaml
@@ -50,6 +50,6 @@ jobs:
           git remote set-url origin https://$GITHUB_ACTOR:${{ secrets.GH_PAT }}@github.com/$GITHUB_REPOSITORY.git
           git stash
           git pull --rebase origin ${{ inputs.branch_name }}
-          git stash pop
+          git stash list | grep stash@{0} && git stash pop || echo "No stash to pop"
           git commit add pak.lock -m "chore: Update pak.lock" || echo "No changes to commit"
           git push origin ${{ inputs.branch_name }}