diff --git a/scripts/install-core.ps1 b/scripts/install-core.ps1
index 463cca0..edb43df 100644
--- a/scripts/install-core.ps1
+++ b/scripts/install-core.ps1
@@ -55,12 +55,14 @@ function Build-FromSource {
 
         Write-Info "Building core CLI..."
         Push-Location $cloneDir
-        go build -o core.exe .
-        if ($LASTEXITCODE -ne 0) {
+        try {
+            go build -o core.exe .
+            if ($LASTEXITCODE -ne 0) {
+                Write-Err "Go build failed"
+            }
+        } finally {
             Pop-Location
-            Write-Err "Go build failed"
         }
-        Pop-Location
 
         New-Item -ItemType Directory -Force -Path $InstallDir | Out-Null
         Move-Item (Join-Path $cloneDir "core.exe") (Join-Path $InstallDir "core.exe") -Force