diff --git a/lib/client.js b/lib/client.js
index a1a969a..36c1e79 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -287,11 +287,13 @@ export default class Client extends EventTarget {
 			return;
 		}
 
-		let msg = irc.parseMessage(event.data);
+		let raw = event.data;
 		if (this.debug) {
-			console.debug("Received:", msg);
+			console.debug("Received:", raw);
 		}
 
+		let msg = irc.parseMessage(raw);
+
 		// If the prefix is missing, assume it's coming from the server on the
 		// other end of the connection
 		if (!msg.prefix) {
@@ -708,9 +710,10 @@ export default class Client extends EventTarget {
 		if (!this.ws) {
 			throw new Error("Failed to send IRC message " + msg.command + ": socket is closed");
 		}
-		this.ws.send(irc.formatMessage(msg));
+		let raw = irc.formatMessage(msg)
+		this.ws.send(raw);
 		if (this.debug) {
-			console.debug("Sent:", msg);
+			console.debug("Sent:", raw);
 		}
 	}