diff --git a/src/scripts/darwin.sh b/src/scripts/darwin.sh
index 91e04e1f..79c12045 100644
--- a/src/scripts/darwin.sh
+++ b/src/scripts/darwin.sh
@@ -279,6 +279,10 @@ ext_dir=$(php -i | grep -Ei "extension_dir => /" | sed -e "s|.*=> s*||")
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 sudo mkdir -m 777 -p "$ext_dir" "$HOME/.composer"
 semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
+if [ "${semver%.*}" != "$version" ]; then
+  add_log "$cross" "PHP" "Could not setup PHP $version"
+  exit 1
+fi
 configure_pecl
 sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
 add_log "$tick" "PHP" "$status PHP $semver"
diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh
index a5b6018a..2f9fff35 100644
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@@ -307,6 +307,10 @@ else
   status="Found"
 fi
 
+if ! command -v php"$version" >/dev/null; then
+  add_log "$cross" "PHP" "Could not setup PHP $version"
+  exit 1
+fi
 semver=$(php_semver)
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1
index 56d7d3d2..cfd5b401 100644
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
@@ -288,18 +288,24 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
     Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" >$null 2>&1
     $arch='x86'
   }
-  if ($version -eq $master_version) {
-    $version = 'master'
-    Invoke-WebRequest -UseBasicParsing -Uri https://github.com/shivammathur/php-builder-windows/releases/latest/download/Get-Php.ps1 -OutFile $php_dir\Get-Php.ps1 > $null 2>&1
-    & $php_dir\Get-Php.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir
-  } else {
-    Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
-  }
+  try {
+    if ($version -eq $master_version) {
+      $version = 'master'
+      Invoke-WebRequest -UseBasicParsing -Uri https://github.com/shivammathur/php-builder-windows/releases/latest/download/Get-Php.ps1 -OutFile $php_dir\Get-Php.ps1 > $null 2>&1
+      & $php_dir\Get-Php.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir
+    } else {
+      Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
+    }
+  } catch { }
 } else {
   $status = "Found"
 }
 
 $installed = Get-Php -Path $php_dir
+if($installed.MajorMinorVersion -ne $version) {
+  Add-Log $cross "PHP" "Could not setup PHP $version"
+  exit 1
+}
 ('date.timezone=UTC', 'memory_limit=-1', 'xdebug.mode=coverage') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
 # Patch till there is a pcov DLL for PHP 8.0 on pecl
 if ($version -eq '8.0') {