diff --git a/scripts/server/database.js b/scripts/server/database.js
index 93cbf5c0..2b609b49 100644
--- a/scripts/server/database.js
+++ b/scripts/server/database.js
@@ -60,11 +60,15 @@ function queryDatabase(dbConnection, queryString) {
 
 // -------------------------------------------------------------------------
 
-function escapeDatabaseString(dbConnection, unsafeString) {
+function escapeDatabaseString(dbConnection, unsafeString = "") {
 	if(!dbConnection) {
 		dbConnection = connectToDatabase();
 	}
-	return dbConnection.escapeString(unsafeString);
+
+	if(typeof unsafeString == "string") {
+		return dbConnection.escapeString(unsafeString);
+	}
+	return unsafeString;
 }
 
 // -------------------------------------------------------------------------
@@ -88,7 +92,9 @@ function getDatabaseError(dbConnection) {
 // -------------------------------------------------------------------------
 
 function freeDatabaseQuery(dbQuery) {
-	dbQuery.free();
+	if(dbQuery != null) {
+		dbQuery.free();
+	}
 	return;
 }