diff --git a/libraries/Error.class.php b/libraries/Error.class.php
index f957d273a..5706d87c8 100644
--- a/libraries/Error.class.php
+++ b/libraries/Error.class.php
@@ -414,7 +414,7 @@ class PMA_Error
     {
         echo '<div class="' . $this->getLevel() . '">';
         echo '<strong>' . $this->getType() . '</strong>';
-        echo ' (' . $this->getHash() . ')';
+        echo ' in ' . $this->getFile() . '#' . $this->getLine();
         echo "<br />\n";
         echo $this->getMessage();
         echo "<br />\n";
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 5ffe3f596..0adc86fd0 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -29,8 +29,14 @@
  * @version $Id$
  */
 
+/**
+ * the error handler
+ */
 require_once './libraries/Error_Handler.class.php';
 
+/**
+ * initialize the error handler
+ */
 $GLOBALS['error_handler'] = new PMA_Error_Handler();
 
 // at this point PMA_PHP_INT_VERSION is not yet defined
diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php
index ccd0ad172..73cc39943 100644
--- a/libraries/grab_globals.lib.php
+++ b/libraries/grab_globals.lib.php
@@ -75,6 +75,7 @@ $_import_blacklist = array(
     '/^sql_query$/i',   // the query to be executed
     '/^GLOBALS$/i',     // the global scope
     '/^str.*$/i',       // PMA localized strings
+    '/^error_handler.*$/i',       // the error handler
     '/^_.*$/i',         // PMA does not use variables starting with _ from extern
     '/^.*\s+.*$/i',     // no whitespaces anywhere
     '/^[0-9]+.*$/i',    // numeric variable names