diff --git a/bt/includes/init_tr.php b/bt/includes/init_tr.php
index 8b6fba78..1fd8f454 100644
--- a/bt/includes/init_tr.php
+++ b/bt/includes/init_tr.php
@@ -77,7 +77,7 @@ class sql_db
 
 	var $DBS           = array();
 
-	var $engine			= 'MySQL';
+	var $engine        = 'MySQL';
 
 	/**
 	* Constructor
@@ -112,7 +112,7 @@ class sql_db
 			if (!$this->sql_query("SET NAMES {$this->cfg['charset']}"))
 			{
 				$this->log_error();
-				error_exit("Could not set charset {$this->cfg['charset']}");
+				error_exit("Could not set charset '{$this->cfg['charset']}'");
 			}
 		}
 
diff --git a/library/includes/core/mysql.php b/library/includes/core/mysql.php
index 437a3a5a..d55ddaf1 100644
--- a/library/includes/core/mysql.php
+++ b/library/includes/core/mysql.php
@@ -35,7 +35,7 @@ class sql_db
 
 	var $DBS            = array();
 
-	var $engine			= 'MySQL';
+	var $engine         = 'MySQL';
 
 	/**
 	* Constructor
@@ -73,7 +73,7 @@ class sql_db
 		{
 			if (!$this->sql_query("SET NAMES {$this->cfg['charset']}"))
 			{
-				$charset_error = "Could not set charset {$this->cfg['charset']}";
+				$charset_error = "Could not set charset '{$this->cfg['charset']}'";
 				if (DBG_LOG)
 				{
 					dbg_log($charset_error, "{$this->cfg['charset']}-DB-charset-FAIL_" . time());
@@ -128,7 +128,7 @@ class sql_db
 
 		if (!@mysql_select_db($this->cfg['dbname'], $this->link))
 		{
-			$db_name = (DBG_USER) ? $this->cfg['dbname'] : '';
+			$db_name = (DBG_USER) ? "'" . $this->cfg['dbname'] . "'" : '';
 			$select_error = "Could not select database $db_name";
 			if (DBG_LOG)
 			{