diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index cb369e4347ba46e57841104cd81d9bc4cedfdc66..68f577b4ad31b18208c6b78c179eab3148288a22 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit cb369e4347ba46e57841104cd81d9bc4cedfdc66
+Subproject commit 68f577b4ad31b18208c6b78c179eab3148288a22
diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index 4f01b198dab82694d2b709e987f2737db4bf6d43..50c4eb8c6912fcc01429ea3c55e7a7b9ff7b628c 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -20,15 +20,20 @@ require realpath(dirname(__FILE__)) . "/includes.php";
 // calling us waits for the full request to process before unblocking
 ob_start();
 
-Piwik_TestingEnvironment::addHooks();
+try {
+    Piwik_TestingEnvironment::addHooks();
 
-GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
+    GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
 
-Tracker::setTestEnvironment();
-Manager::getInstance()->deleteAll();
-Option::clearCache();
-Site::clearCache();
-Cache::deleteTrackerCache();
+    Tracker::setTestEnvironment();
+    Manager::getInstance()->deleteAll();
+    Option::clearCache();
+    Site::clearCache();
+    Cache::deleteTrackerCache();
+
+    include PIWIK_INCLUDE_PATH . '/piwik.php';
+} catch (Exception $ex) {
+    echo "Unexpected error during tracking: " . $ex->getTraceAsString() . "\n";
+}
 
-include PIWIK_INCLUDE_PATH . '/piwik.php';
 ob_end_flush();