diff --git a/scripts/client/utilities.js b/scripts/client/utilities.js
index b2b7d076..876df66a 100644
--- a/scripts/client/utilities.js
+++ b/scripts/client/utilities.js
@@ -95,10 +95,16 @@ function runClientCode(code, returnTo) {
 	try {
 		returnValue = eval("(" + code + ")");
 	} catch(error) {
-		sendNetworkEventToServer("vrr.runCodeFail", returnTo, code);
+		sendNetworkEventToServer("vrr.runCodeFail", returnTo, error.toString());
 		return false;
 	}
-	sendNetworkEventToServer("vrr.runCodeSuccess", returnTo, code, returnValue);
+	let returnValueString = returnValue;
+	if(returnValue != null && returnValue != undefined) {
+		returnValueString = `${returnValue.toString()} (${typeof returnValue})`;
+	} else {
+		returnValueString = "null/undefined";
+	}
+	sendNetworkEventToServer("vrr.runCodeSuccess", returnTo, returnValueString);
 }
 
 // ===========================================================================