--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -14,14 +14,6 @@
 if (strstr($_SERVER['PHP_SELF'], "labs/") || strstr($_SERVER['PHP_SELF'], "admin/") || strstr($_SERVER['PHP_SELF'], "heuristics/")) {
     $basePath = "../";
 }
-if ($_SERVER['HTTP_HOST'] != "localhost") {
-require $basePath."lib/amon-php/amon.php";
-Amon::config(array('address'=> 'http://127.0.0.1:2464', 
-		'protocol' => 'http', 
-		'secret_key' => "JBcSUdFOi5lK0vCjLjbHDpQamcBnRA4iV7QLaTADeDQ"));
-Amon::setup_exception_handler();
-}
-
 require ROOT . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'openid.php';
 $openid = new LightOpenID($_SERVER['HTTP_HOST']);
 // you have to open the session to be able to modify or remove it

--- a/lib/openid.php
+++ b/lib/openid.php
@@ -81,7 +81,7 @@
             $this->trustRoot = (strpos($host, '://') ? $host : 'https://' . $host);
         }
 
-        if(($host_end = strpos($this->trustRoot, '/', 8)) !== false) {
+        if(($host_end = @strpos($this->trustRoot, '/', 8)) !== false) {
             $this->trustRoot = substr($this->trustRoot, 0, $host_end);
         }