Index: branches/unlabeled/unlabeled-1.13.2/core/kernel/db/db_connection.php
===================================================================
diff -u -r5653 -r5778
--- branches/unlabeled/unlabeled-1.13.2/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 5653)
+++ branches/unlabeled/unlabeled-1.13.2/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 5778)
@@ -176,7 +176,7 @@
 		function Connect($host, $user, $pass, $db, $force_new = false)
 		{
 			$func = $this->getMetaFunction('connect');
-			$this->connectionID = $func($host, $user, $pass, $force_new) or trigger_error("Can't connect to db", E_USER_ERROR);
+			$this->connectionID = $func($host, $user, $pass, $force_new) or trigger_error("Database connection failed, please check your connection settings", E_USER_ERROR);
 			if ($this->connectionID) {
 				$this->setDB($db);
 				$this->showError();
Index: branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php
===================================================================
diff -u -r5767 -r5778
--- branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 5767)
+++ branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 5778)
@@ -144,7 +144,7 @@
 				$application =& kApplication::Instance();
 
 				// string used to separate debugger records while in file (used in debugger dump filename too)
-				$this->rowSeparator = '@'.$application->GetSID().'@';
+				$this->rowSeparator = '@'.(is_object($application->Factory) ? $application->GetSID() : 0).'@';
 
 				// include debugger files from this url
 				$reg_exp = '/^'.preg_quote(FULL_PATH, '/').'/';