diff --git a/phpgwapi/inc/class.db_mssql.inc.php b/phpgwapi/inc/class.db_mssql.inc.php
index 86772dab6f..a6d2532dae 100644
--- a/phpgwapi/inc/class.db_mssql.inc.php
+++ b/phpgwapi/inc/class.db_mssql.inc.php
@@ -330,6 +330,7 @@
 			{
 				printf("<br><b>Line:</b> %s",$line);
 			}
+			printf("<br><b>Function:</b> %s\n",function_backtrace());
 
 			if ($this->Halt_On_Error != "report")
 			{
diff --git a/phpgwapi/inc/class.db_mysql.inc.php b/phpgwapi/inc/class.db_mysql.inc.php
index ed4dabcfa5..be8811a27b 100644
--- a/phpgwapi/inc/class.db_mysql.inc.php
+++ b/phpgwapi/inc/class.db_mysql.inc.php
@@ -430,6 +430,7 @@
 			{
 				printf("<br><b>Line:</b> %s",$line);
 			}
+			printf("<br><b>Function:</b> %s\n",function_backtrace());
 
 			if ($this->Halt_On_Error != "report")
 			{
diff --git a/phpgwapi/inc/class.db_pgsql.inc.php b/phpgwapi/inc/class.db_pgsql.inc.php
index 1e0c64a73b..67397e53d8 100644
--- a/phpgwapi/inc/class.db_pgsql.inc.php
+++ b/phpgwapi/inc/class.db_pgsql.inc.php
@@ -65,11 +65,11 @@
 					. $this->ifadd("'".$Password."'", 'password=');
 				if ($GLOBALS['phpgw_info']['server']['db_persistent'])
 				{
-					$this->Link_ID=pg_pconnect($cstr);
+					$this->Link_ID = pg_pconnect($cstr);
 				}
 				else
 				{
-					$this->Link_ID=pg_connect($cstr);
+					$this->Link_ID = pg_connect($cstr);
 				}
 
 				if (! $this->Link_ID)
@@ -437,6 +437,15 @@
 				}
 			}
 
+			if ($this->xmlrpc || $this->soap)
+			{
+				$s .=	sprintf("Function/Module: %s\n",function_backtrace());
+			}
+			else
+			{
+				$s .=	sprintf("<br><b>Function/Module:</b> %s\n",function_backtrace());
+			}
+
 			if ($this->Halt_On_Error == 'yes')
 			{
 				if (! $this->xmlrpc && ! $this->soap)
@@ -456,7 +465,14 @@
 			else
 			{
 				echo $s;
-				$GLOBALS['phpgw']->common->phpgw_exit(True);
+				if (is_object($GLOBALS['phpgw']->common))
+				{
+					$GLOBALS['phpgw']->common->phpgw_exit(True);
+				}
+				else
+				{
+					exit();
+				}
 			}
 		}