diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php
index 0b9089833..d6832fc41 100644
--- a/libraries/Error_Handler.class.php
+++ b/libraries/Error_Handler.class.php
@@ -116,7 +116,7 @@ class PMA_Error_Handler
     public function handleError($errno, $errstr, $errfile, $errline)
     {
         // create error object
-        $error = new PMA_Error($errno, $errstr, $errfile, $errline);
+        $error = new PMA_Error($errno, htmlspecialchars($errstr), $errfile, $errline);
 
         // do not repeat errors
         $this->_errors[$error->getHash()] = $error;