diff --git a/phpgwapi/inc/class.error.inc.php b/phpgwapi/inc/class.error.inc.php
index 2bb46df6f1..e7596c7e5b 100755
--- a/phpgwapi/inc/class.error.inc.php
+++ b/phpgwapi/inc/class.error.inc.php
@@ -68,7 +68,7 @@
 				echo "</center>";
 				// Commit stack to log
 				$phpgw->log->commit();
-				exit();
+				$phpgw->common->phpgw_exit(True);
 			}
 		}
 	}
diff --git a/phpgwapi/inc/class.log.inc.php b/phpgwapi/inc/class.log.inc.php
index 95b79530be..f00b4a2abc 100644
--- a/phpgwapi/inc/class.log.inc.php
+++ b/phpgwapi/inc/class.log.inc.php
@@ -158,7 +158,7 @@
 				
 				$html .= "\t<tr bgcolor=".'"'.$color.'"'.">\n";
 				$html .= "\t\t<td align=center>".$i."</td>\n";
-				$html .= "\t\t<td>".date('Y.n.d:H.i.s',$err->timestamp)."</td>\n";
+				$html .= "\t\t<td>".$phpgw->common->show_date($err->timestamp)."</td>\n";
 				$html .= "\t\t<td>".$phpgw_info['flags']['currentapp']."&nbsp </td>\n";
 				$html .= "\t\t<td align=center>".$err->severity."</td>\n";
 				$html .= "\t\t<td>".$err->code."</td>\n";