diff --git a/installer/builder/Main.cs b/installer/builder/Main.cs
index f9b82793..7f3fc696 100755
--- a/installer/builder/Main.cs
+++ b/installer/builder/Main.cs
@@ -60,8 +60,7 @@ namespace AMXXRelease
 
 			if (!builder.Build(m_Cfg, build))
 			{
-				Console.WriteLine("Build failed!");
-				System.Environment.Exit(1);
+				throw new Exception("Build failed!");
 			} 
 			else 
 			{
diff --git a/support/buildbot/startbuild.pl b/support/buildbot/startbuild.pl
index a72ce804..e00faec9 100755
--- a/support/buildbot/startbuild.pl
+++ b/support/buildbot/startbuild.pl
@@ -9,18 +9,16 @@ require 'helpers.pm';
 
 chdir('../../installer/builder');
 
+my $output;
 if ($^O eq "linux") {
-	system("mono builder.exe");
+	$output = `mono builder.exe`;
 } else {
-	system("builder.exe");
+	$output = `builder.exe`;
 }
 
-if ($? != 0)
-{
-	die "Build failed: $!\n";
-}
-else
-{
+if ($output =~ /Build failed/) {
+	die "Build failed!\n";
+} else {
 	exit(0);
 }