diff --git a/Build/build.ps1 b/Build/build.ps1
index dabf1b34..5e4bb40b 100644
--- a/Build/build.ps1
+++ b/Build/build.ps1
@@ -35,16 +35,17 @@ task default -depends Test
 
 # Ensure a clean working directory
 task Clean {
+  Write-Host "Setting location to $baseDir"
   Set-Location $baseDir
   
   if (Test-Path -path $workingDir)
   {
-    Write-Output "Deleting existing working directory $workingDir"
+    Write-Host "Deleting existing working directory $workingDir"
     
     del $workingDir -Recurse -Force
   }
   
-  Write-Output "Creating working directory $workingDir"
+  Write-Host "Creating working directory $workingDir"
   New-Item -Path $workingDir -ItemType Directory
 }
 
diff --git a/Build/runbuild.ps1 b/Build/runbuild.ps1
index cd468ecb..0a3910ee 100644
--- a/Build/runbuild.ps1
+++ b/Build/runbuild.ps1
@@ -2,17 +2,23 @@
 
 $path = Split-Path -Path $MyInvocation.MyCommand.Path
 
+write-host "Importing psake"
 Import-Module ($path + '\..\Tools\PSake\psake.psm1')
 
 Try
 {
+  write-host "Starting build.ps1"
   Invoke-psake ($path + '\build.ps1') Test -framework 3.5
 
-  if ($error -ne '')
+  if ($psake.build_success -eq $false)
   {
-    $exitCode = $error.Count
-    write-host "build.ps1 exit code:  $exitCode" -fore RED
-    exit  $exitCode
+    write-host "build.ps1 failed" -fore RED
+    exit 1
+  }
+  else
+  {
+    write-host "build.ps1 succeeded" -fore GREEN
+    exit 0
   }
 }
 Finally