diff --git a/resources/tests.wesnoth.org/autotester/run_unit_tests.sh b/resources/tests.wesnoth.org/autotester/run_unit_tests.sh
index 6ca17509579..df147e62c4a 100755
--- a/resources/tests.wesnoth.org/autotester/run_unit_tests.sh
+++ b/resources/tests.wesnoth.org/autotester/run_unit_tests.sh
@@ -21,5 +21,5 @@ export DISPLAY=:0.0
 WEBDIR=$FULL_PATH/../htdocs
 
 cd $FULL_PATH/../trunk
-nice php -f ../autotester/run_unit_tests.php $WEBDIR
+nice php -f $FULL_PATH/run_unit_tests.php $WEBDIR
 #> $FULL_PATH/err.log
diff --git a/resources/tests.wesnoth.org/include/Build.php b/resources/tests.wesnoth.org/include/Build.php
index 8ede05d3a7a..796834128e9 100644
--- a/resources/tests.wesnoth.org/include/Build.php
+++ b/resources/tests.wesnoth.org/include/Build.php
@@ -207,13 +207,17 @@ class Build {
 			}
 			if (strpos($this->error_msg,'error') !== false 
 				|| strpos($this->error_msg,'ld returned'))
-				$this->status = self::S_ERROR;
+					$this->status = self::S_ERROR;
+			$this->error_msg = str_replace("'","\\'",$this->error_msg);
 		}
 
 		$this->time = time();
 		$this->svn_revision = $revision;
 
-		return $this->status == self::S_GOOD;
+		if ($this->status == self::S_GOOD)
+			return true;
+		$this->insert();
+		return false;
 	}
 
 	public function getTestName()