diff --git a/code/defines/procs/dbcore.dm b/code/defines/procs/dbcore.dm
index 31bbab3d0d5..805726ba748 100644
--- a/code/defines/procs/dbcore.dm
+++ b/code/defines/procs/dbcore.dm
@@ -117,7 +117,12 @@ DBQuery/proc/Execute(var/list/argument_list = null, var/pass_not_found = 0, sql_
 	if (argument_list)
 		sql_query = parseArguments(sql_query, argument_list, pass_not_found)
 
-	return _dm_db_execute(_db_query, sql_query, db_connection._db_con, cursor_handler, null)
+	var/result = _dm_db_execute(_db_query, sql_query, db_connection._db_con, cursor_handler, null)
+
+	if (ErrorMsg())
+		log_debug("SQL Error: '[ErrorMsg()]'")
+
+	return result
 
 DBQuery/proc/NextRow()
 	return _dm_db_next_row(_db_query,item,conversions)
@@ -179,7 +184,7 @@ DBQuery/proc/parseArguments(var/query_to_parse = null, var/list/argument_list, v
 		return 0
 
 	for (var/placeholder in argument_list)
-		if (!findtextEx(sql, placeholder))
+		if (!findtextEx(query_to_parse, placeholder))
 			if (pass_not_found)
 				continue
 			else
@@ -196,7 +201,7 @@ DBQuery/proc/parseArguments(var/query_to_parse = null, var/list/argument_list, v
 		else
 			return 0
 
-		query_to_parse = replacetextEx(sql, placeholder, argument)
+		query_to_parse = replacetextEx(query_to_parse, placeholder, argument)
 
 	return query_to_parse
 
diff --git a/code/modules/admin/verbs/warning.dm b/code/modules/admin/verbs/warning.dm
index 34d5c4b3c29..67950d05b28 100644
--- a/code/modules/admin/verbs/warning.dm
+++ b/code/modules/admin/verbs/warning.dm
@@ -265,15 +265,15 @@
 		dat += "<th width='60%'>REASON</th>"
 		dat += "</tr>"
 
-		var/list/query_details = list("a_ckey", "ckey")
+		var/list/query_details = list(":a_ckey", ":ckey")
 		var/paramone = ""
 		var/paramtwo = ""
 		if(adminckey)
 			paramone = "AND a_ckey = :a_ckey "
-			query_details["a_ckey"] = adminckey
+			query_details[":a_ckey"] = adminckey
 		if(playerckey)
 			paramtwo = "AND ckey = :ckey "
-			query_details["ckey"] = playerckey
+			query_details[":ckey"] = playerckey
 
 		var/DBQuery/search_query = dbcon.NewQuery("SELECT id, time, severity, reason, notes, ckey, a_ckey, acknowledged, expired, edited, lasteditor, lasteditdate FROM ss13_warnings WHERE visible = 1 [paramone] [paramtwo] ORDER BY time DESC;")
 		search_query.Execute(query_details, 1)