diff --git a/exec/load/ircd/server.js b/exec/load/ircd/server.js
index 8d14e8b3d85fffb90089d3431d667b72065bb169..f390a8f123cee9f348b2ac77a7439b8f7c5018af 100644
--- a/exec/load/ircd/server.js
+++ b/exec/load/ircd/server.js
@@ -602,6 +602,15 @@ function Server_Work(cmdline) {
 			));
 			break;
 		} else { /* A user changing their nick */
+			if (origin.server) {
+				gnotice(format(
+					"Server %s (origin %s) sent malformed NICK message: %s",
+					this.nick,
+					origin.nick,
+					p.join(" ")
+				));
+				break;
+			}
 			tmp = Users[p[0].toUpperCase()];
 			if (tmp && tmp.nick.toUpperCase() != origin.nick.toUpperCase()) {
 				gnotice(format(