diff --git a/core/database.class.php b/core/database.class.php
index fc93269f..5f2c1c72 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -349,7 +349,7 @@ class Database {
 			return $stmt;
 		}
 		catch(PDOException $pdoe) {
-			throw new SCoreException($pdoe->getMessage()."<p>Query: ".$query);
+			throw new SCoreException($pdoe->getMessage()."<p><b>Query:</b> ".$query);
 		}
 	}
 
diff --git a/core/util.inc.php b/core/util.inc.php
index 9fce4dda..d2582d59 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -1094,7 +1094,13 @@ function _load_extensions() {
 function _fatal_error(Exception $e) {
 	$version = VERSION;
 	$message = $e->getMessage();
+
 	//$trace = var_dump($e->getTrace());
+
+	//$hash = exec("git rev-parse HEAD");
+	//$h_hash = $hash ? "<p><b>Hash:</b> $hash" : "";
+	//'.$h_hash.'
+
 	header("HTTP/1.0 500 Internal Error");
 	echo '
 <html>
@@ -1103,7 +1109,8 @@ function _fatal_error(Exception $e) {
 	</head>
 	<body>
 		<h1>Internal Error</h1>
-		<p>'.$message.'
+		<p><b>Message:</b> '.$message.'
+		<p><b>Version:</b> '.$version.'
 	</body>
 </html>
 ';
