diff --git a/db_operations.php b/db_operations.php
index 9d48bb3009..5a1979ebe6 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -142,6 +142,8 @@ if ($pmaString->strlen($GLOBALS['db'])
             );
             $message->addParam($GLOBALS['db']);
             $message->addParam($_REQUEST['newname']);
+        } else {
+            $message = PMA_Message::error();
         }
         $reload     = true;
 
@@ -158,10 +160,6 @@ if ($pmaString->strlen($GLOBALS['db'])
                 $GLOBALS['PMA_Config']->setCookie('pma_switch_to_new', '');
             }
         }
-
-        if ($_error && ! isset($message)) {
-            $message = PMA_Message::error();
-        }
     }
 
     /**