diff --git a/src/ci/docker/host-x86_64/mingw-check/validate-error-codes.sh b/src/ci/docker/host-x86_64/mingw-check/validate-error-codes.sh
index d5231ede59109..e9aa948eb877f 100755
--- a/src/ci/docker/host-x86_64/mingw-check/validate-error-codes.sh
+++ b/src/ci/docker/host-x86_64/mingw-check/validate-error-codes.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 # Checks that no error code explanation is removed.
 
-set -euo pipefail
+set -eo pipefail
+
+if [[ -z "$BASE_COMMIT" ]]; then
+    echo "not checking error code explanations removal"
+    exit 0
+fi
 
 echo "Check if an error code explanation was removed..."
 
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index f6b2cf3431354..489c3d7660195 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -219,9 +219,13 @@ else
   command="/checkout/src/ci/run.sh"
 fi
 
-# Get some needed information for $BASE_COMMIT
-git fetch "https://github.com/$GITHUB_REPOSITORY" "$GITHUB_BASE_REF"
-BASE_COMMIT="$(git merge-base FETCH_HEAD HEAD)"
+if [ "$CI" != "" ]; then
+    # Get some needed information for $BASE_COMMIT
+    git fetch "https://github.com/$GITHUB_REPOSITORY" "$GITHUB_BASE_REF"
+    BASE_COMMIT="$(git merge-base FETCH_HEAD HEAD)"
+else
+    BASE_COMMIT=""
+fi
 
 docker \
   run \