diff --git a/ChangeLog b/ChangeLog
index 81670e91e..a21d0fd5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
+3.3.7.0 (not yet released)
+
 3.3.6.0 (not yet released)
 - bug #3033063 [core] Navi gets wrong db name
 - bug #3031705 [core] Fix generating condition for real numbers by comparing
diff --git a/Documentation.html b/Documentation.html
index bfe5bb7e3..95e940fed 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.3.6-dev - Documentation</title>
+    <title>phpMyAdmin 3.3.7-dev - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.3.6-dev 
+        3.3.7-dev 
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 8be673ecd..bdcdd66aa 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 3.3.6-dev
+  Version 3.3.7-dev
   -----------------
   http://www.phpmyadmin.net/
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index a6b1d8c2c..6ac9acab0 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -92,7 +92,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.3.6-dev');
+        $this->set('PMA_VERSION', '3.3.7-dev');
         /**
          * @deprecated
          */
diff --git a/libraries/Error.class.php b/libraries/Error.class.php
index 849287e43..9f0ae9a2c 100644
--- a/libraries/Error.class.php
+++ b/libraries/Error.class.php
@@ -319,7 +319,7 @@ class PMA_Error extends PMA_Message
         if (in_array($function, $include_functions)) {
             echo PMA_Error::relPath($arg);
         } elseif (is_scalar($arg)) {
-            echo gettype($arg) . ' ' . $arg;
+            echo gettype($arg) . ' ' . htmlspecialchars($arg);
         } else {
             echo gettype($arg);
         }
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 4750ee225..bf1611450 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -321,6 +321,12 @@ function PMA_DBI_get_client_info()
 function PMA_DBI_getError($link = null)
 {
     $GLOBALS['errno'] = 0;
+
+    /* Treat false same as null because of controllink */
+    if ($link === false) {
+        $link = null;
+    }
+
     if (null === $link && isset($GLOBALS['userlink'])) {
         $link =& $GLOBALS['userlink'];
 
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 9672385df..2c00bcdbc 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -379,6 +379,11 @@ function PMA_DBI_getError($link = null)
 {
     $GLOBALS['errno'] = 0;
 
+    /* Treat false same as null because of controllink */
+    if ($link === false) {
+        $link = null;
+    }
+
     if (null === $link && isset($GLOBALS['userlink'])) {
         $link =& $GLOBALS['userlink'];
         // Do not stop now. We still can get the error code
diff --git a/translators.html b/translators.html
index d78b68bc4..707b400e3 100644
--- a/translators.html
+++ b/translators.html
@@ -11,7 +11,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.3.6-dev - Official translators</title>
+    <title>phpMyAdmin 3.3.7-dev - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -19,7 +19,7 @@
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.3.6-dev 
+        3.3.7-dev 
         official translators list
     </h1>
 </div>