diff --git a/extensions/curl/AMBuilder b/extensions/curl/AMBuilder
index dd4d6a4d..8c8b4992 100644
--- a/extensions/curl/AMBuilder
+++ b/extensions/curl/AMBuilder
@@ -59,7 +59,8 @@ elif AMBuild.target['platform'] == 'windows':
 	                    'lib',
 	                    'LIB-Release',
 	                    'libcurl.lib')
-	binary.RelinkIfNewer(path)
+	if os.path.isfile(path):
+		binary.RelinkIfNewer(path)
 	binary['POSTLINKFLAGS'].extend([path, 'ws2_32.lib'])
 
 SM.AutoVersion('extensions/curl', binary)
diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl
index 9e5c14c4..b8c4bfc4 100755
--- a/tools/buildbot/bootstrap.pl
+++ b/tools/buildbot/bootstrap.pl
@@ -49,7 +49,7 @@ if ($reconf) {
 		$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
 	}
 	print "$result\n";
-	if ($? == -1) {
+	if ($? != 0) {
 		die('Could not configure!');
 	}
 }
diff --git a/tools/buildbot/startbuild.pl b/tools/buildbot/startbuild.pl
index d5a491bd..d3f43558 100755
--- a/tools/buildbot/startbuild.pl
+++ b/tools/buildbot/startbuild.pl
@@ -11,23 +11,16 @@ require 'helpers.pm';
 chdir('../../../OUTPUT');
 
 if ($^O eq "linux") {
-	system("python3.1 build.py");
+	$output = `python3.1 build.py 2>&1`;
 } else {
-	system("C:\\Python31\\python.exe build.py");
+	$output = `C:\\Python31\\python.exe build.py 2>&1`;
 }
+print($output);
 
-if ($? == -1)
+if ($? != 0)
 {
 	die "Build failed: $!\n";
 }
-elsif ($^O eq "linux" and $? & 127)
-{
-	die "Build died :(\n";
-}
-elsif ($? >> 8 != 0)
-{
-	die "Build failed with exit code: " . ($? >> 8) . "\n";
-}
 else
 {
 	exit(0);