diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index 5a2a64148a..f81f097beb 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -358,7 +358,7 @@ function load_edit_users($tool, $id)
 	$id = Database::escape_string($id);
 
 	$sql = "SELECT * FROM $tbl_item_property WHERE tool='$tool' AND ref='$id'";
-	$result = Database::query($sql,__FILE__,__LINE__) or die();
+	$result = Database::query($sql,__FILE__,__LINE__) or die(Database::error());
 	while ($row = Database::fetch_array($result))
 	{
 		$to_group=$row['to_group_id'];
@@ -756,7 +756,7 @@ function change_visibility_announcement($tool,$id)
 
 	$sql = "SELECT * FROM $tbl_item_property WHERE tool='$tool' AND ref='$id'";
 
-	$result = Database::query($sql,__FILE__,__LINE__) or die();
+	$result = Database::query($sql,__FILE__,__LINE__) or die(Database::error());
 	$row = Database::fetch_array($result);
 
 	if ($row['visibility']=='1')
@@ -858,7 +858,7 @@ function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_use
 
 	// store in the table announcement
 	$sql = "INSERT INTO $tbl_announcement SET content = '$newContent', title = '$emailTitle', end_date = NOW(), display_order ='$order', session_id=".intval($_SESSION['id_session']);
-	$result = Database::query($sql,__FILE__,__LINE__) or die();
+	$result = Database::query($sql,__FILE__,__LINE__) or die(Database::error());
 	if ($result === false) {
 		return false;
 	}
@@ -924,7 +924,7 @@ function edit_advalvas_item($id,$emailTitle,$newContent,$to,$file = array(), $fi
 
 	// store the modifications in the table announcement
  	$sql = "UPDATE $tbl_announcement SET content='$newContent', title = '$emailTitle' WHERE id='$id'";
-	$result = Database::query($sql,__FILE__,__LINE__) or die();
+	$result = Database::query($sql,__FILE__,__LINE__) or die(Database::error());
 
 	// save attachment file
 	$row_attach = get_attachment($id);
@@ -940,7 +940,7 @@ function edit_advalvas_item($id,$emailTitle,$newContent,$to,$file = array(), $fi
 
 	// we remove everything from item_property for this
 	$sql_delete="DELETE FROM $tbl_item_property WHERE ref='$id' AND tool='announcement'";
-	$result = Database::query($sql_delete,__FILE__,__LINE__) or die();
+	$result = Database::query($sql_delete,__FILE__,__LINE__) or die(Database::error());
 
 	// store in item_property (first the groups, then the users
 	if (!is_null($to)) // !is_null($to): when no user is selected we send it to everyone
diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index fded438bb5..7638658ec6 100755
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -1623,7 +1623,7 @@ function update_Db_course($courseDbName, $language = null)
 			  PRIMARY KEY  (survey_id)
 			)" . $charset_clause;
 
-	$result = Database::query($sql,__FILE__,__LINE__) or die();
+	$result = Database::query($sql,__FILE__,__LINE__) or die(Database::error());
 	$sql = "ALTER TABLE `".$TABLESURVEY."` ADD INDEX ( session_id )";
 	Database::query($sql,__FILE__,__LINE__);
 
@@ -1638,7 +1638,7 @@ function update_Db_course($courseDbName, $language = null)
 			  session_id SMALLINT(5) UNSIGNED NOT NULL default 0,
 			  PRIMARY KEY  (survey_invitation_id)
 			)" . $charset_clause;
-	$result = Database::query($sql, __FILE__, __LINE__) or die();
+	$result = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 
 	$sql = "CREATE TABLE `".$TABLESURVEYQUESTION."` (
 			  question_id int unsigned NOT NULL auto_increment,
@@ -1655,7 +1655,7 @@ function update_Db_course($courseDbName, $language = null)
 			  survey_group_sec2 int unsigned NOT NULL default '0',
 			  PRIMARY KEY  (question_id)
 			)" . $charset_clause;
-	$result = Database::query($sql, __FILE__, __LINE__) or die();
+	$result = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 
 	$sql ="CREATE TABLE `".$TABLESURVEYQUESTIONOPTION."` (
 	  question_option_id int unsigned NOT NULL auto_increment,
@@ -1666,7 +1666,7 @@ function update_Db_course($courseDbName, $language = null)
 	  value int NOT NULL default '0',
 	  PRIMARY KEY  (question_option_id)
 	)" . $charset_clause;
-	$result = Database::query($sql, __FILE__, __LINE__) or die();
+	$result = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 
 	$sql = "CREATE TABLE `".$TABLESURVEYANSWER."` (
 			  answer_id int unsigned NOT NULL auto_increment,
@@ -1677,7 +1677,7 @@ function update_Db_course($courseDbName, $language = null)
 			  user varchar(250) NOT NULL,
 			  PRIMARY KEY  (answer_id)
 			)" . $charset_clause;
-	$result = Database::query($sql, __FILE__, __LINE__) or die();
+	$result = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 
 	$sql = "CREATE TABLE `".$TABLESURVEYGROUP."` (
 			  id int unsigned NOT NULL auto_increment,
@@ -1687,7 +1687,7 @@ function update_Db_course($courseDbName, $language = null)
 			  PRIMARY KEY  (id)
 			)" . $charset_clause;
 
-	$result = Database::query($sql, __FILE__, __LINE__) or die();
+	$result = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 
 	// table glosary
 	$sql = "CREATE TABLE `".$TBL_GLOSSARY."` (
@@ -1698,7 +1698,7 @@ function update_Db_course($courseDbName, $language = null)
 			  session_id smallint default 0,
 			  PRIMARY KEY  (glossary_id)
 			)" . $charset_clause;
-	$result = Database::query($sql, __FILE__, __LINE__) or die();
+	$result = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 	$sql = "ALTER TABLE `".$TBL_GLOSSARY . "` ADD INDEX ( session_id ) ";
 	Database::query($sql, __FILE__, __LINE__);
 
@@ -1715,7 +1715,7 @@ function update_Db_course($courseDbName, $language = null)
 			  status int,
 			  PRIMARY KEY  (notebook_id)
 			)" . $charset_clause;
-	$result = Database::query($sql, __FILE__, __LINE__) or die();
+	$result = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 
 	/* Attendance tool */
 
@@ -1731,7 +1731,7 @@ function update_Db_course($courseDbName, $language = null)
 			attendance_weight float(6,2) NOT NULL default '0.0',
 			session_id int NOT NULL default 0
 		)" . $charset_clause;
-	$result = Database::query($sql, __FILE__, __LINE__) or die();
+	$result = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 	$sql  = "ALTER TABLE `".$TBL_ATTENDANCE . "` ADD INDEX (session_id)";
 	Database::query($sql, __FILE__, __LINE__);
 	$sql  = "ALTER TABLE `".$TBL_ATTENDANCE . "` ADD INDEX (active)";
@@ -1745,7 +1745,7 @@ function update_Db_course($courseDbName, $language = null)
 			presence tinyint(3) NOT NULL DEFAULT 0,
 			PRIMARY KEY(user_id, attendance_calendar_id)
 		)" . $charset_clause;
-	$result = Database::query($sql, __FILE__, __LINE__) or die();
+	$result = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 	$sql  = "ALTER TABLE `".$TBL_ATTENDANCE_SHEET . "` ADD INDEX (presence) ";
 	Database::query($sql, __FILE__, __LINE__);
 
@@ -1758,7 +1758,7 @@ function update_Db_course($courseDbName, $language = null)
 			done_attendance tinyint(3) NOT NULL default 0,
 			PRIMARY KEY(id)
 		)" . $charset_clause;
-	$result = Database::query($sql, __FILE__, __LINE__) or die();
+	$result = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 	$sql  = "ALTER TABLE `".$TBL_ATTENDANCE_CALENDAR."` ADD INDEX (attendance_id)";
 	Database::query($sql, __FILE__, __LINE__);
 	$sql  = "ALTER TABLE `".$TBL_ATTENDANCE_CALENDAR."` ADD INDEX (done_attendance)";
@@ -1772,7 +1772,7 @@ function update_Db_course($courseDbName, $language = null)
 			attendance_id int NOT NULL,
 			score int NOT NULL DEFAULT 0
 		)" . $charset_clause;
-	$result = Database::query($sql, __FILE__, __LINE__) or die();
+	$result = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 	$sql    = "ALTER TABLE `".$TBL_ATTENDANCE_RESULT."` ADD INDEX (attendance_id)";
 	Database::query($sql, __FILE__, __LINE__);
 	$sql    = "ALTER TABLE `".$TBL_ATTENDANCE_RESULT."` ADD INDEX (user_id)";
diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php
index ee738cc6cd..d0d2379f1f 100755
--- a/main/inc/lib/blog.lib.php
+++ b/main/inc/lib/blog.lib.php
@@ -2343,7 +2343,7 @@ class Blog {
 			WHERE btu.blog_id = $blog_id AND btu.user_id = " . $myrow['user_id'] . "";
 
 			if (!($sql_res = Database::query($sql, __FILE__, __LINE__))) {
-				die();
+				die(Database::error());
 			}
 
 			$task = '';
diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
index 39bb04bd04..6445f7632a 100755
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@@ -1329,7 +1329,7 @@ class TrackingCourseLog {
 
 		$sql .=	" LIMIT $from, $number_of_items ";
 
-		$res = Database::query($sql, __FILE__, __LINE__) or die();
+		$res = Database::query($sql, __FILE__, __LINE__) or die(Database::error());
 		$resources = array ();
 
 		while ($row = Database::fetch_array($res)) {
@@ -1370,7 +1370,7 @@ class TrackingCourseLog {
 					$condition = 'tool.title as title';
 					$query_document = "SELECT $condition FROM $table_tool tool" .
 										" WHERE id = $ref";
-					$rs_document = Database::query($query_document, __FILE__, __LINE__) or die();
+					$rs_document = Database::query($query_document, __FILE__, __LINE__) or die(Database::error());
 					$obj_document = Database::fetch_object($rs_document);
 					$row[4] = $obj_document->title;
 				}
diff --git a/main/wiki/index.php b/main/wiki/index.php
index b0959356c3..2e49abbdaf 100755
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -2295,7 +2295,7 @@ if ($_GET['action']=='discuss')
 					$message_author=api_get_user_id();
 
 					$sql="INSERT INTO $tbl_wiki_discuss (publication_id, userc_id, comment, p_score, dtime) VALUES ('".$id."','".$message_author."','".$_POST['comment']."','".$_POST['rating']."','".$dtime."')";
-					$result=Database::query($sql,__FILE__,__LINE__) or die();
+					$result=Database::query($sql,__FILE__,__LINE__) or die(Database::error());
 
 					check_emailcue($id, 'D', $dtime, $message_author);
 
@@ -2306,17 +2306,17 @@ if ($_GET['action']=='discuss')
 			$user_table = Database :: get_main_table(TABLE_MAIN_USER);
 
 			$sql="SELECT * FROM $tbl_wiki_discuss reviews, $user_table user  WHERE reviews.publication_id='".$id."' AND user.user_id='".$firstuserid."' ORDER BY id DESC";
-			$result=Database::query($sql,__FILE__,__LINE__) or die();
+			$result=Database::query($sql,__FILE__,__LINE__) or die(Database::error());
 
 			$countWPost = Database::num_rows($result);
 			echo get_lang('NumComments').": ".$countWPost; //comment's numbers
 
 			$sql="SELECT SUM(p_score) as sumWPost FROM $tbl_wiki_discuss WHERE publication_id='".$id."' AND NOT p_score='-' ORDER BY id DESC";
-			$result2=Database::query($sql,__FILE__,__LINE__) or die();
+			$result2=Database::query($sql,__FILE__,__LINE__) or die(Database::error());
 			$row2=Database::fetch_array($result2);
 
 			$sql="SELECT * FROM $tbl_wiki_discuss WHERE publication_id='".$id."' AND NOT p_score='-'";
-			$result3=Database::query($sql,__FILE__,__LINE__) or die();
+			$result3=Database::query($sql,__FILE__,__LINE__) or die(Database::error());
 			$countWPost_score= Database::num_rows($result3);
 
 			echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score;//