diff --git a/Changes b/Changes
index f4aa3e7df..b620c11f3 100644
--- a/Changes
+++ b/Changes
@@ -1774,4 +1774,6 @@ seen. gmtime warning still there
   the idea
 - Fixed bug #000613 reported by AngryWolf where we were writing a null to the log file when 
   we reached max size.
- 
+- Fixed a bug where helpop would pass on a null pointer if it was a remote
+  client (this needs more investigating, could someone find out how the fuck
+  it can get a remote helpop that's blank anyhow?). 
diff --git a/src/s_serv.c b/src/s_serv.c
index 29b34fe33..21e67384c 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -2656,6 +2656,8 @@ CMD_FUNC(m_help)
 	}
 	else
 	{
+		if (!message)
+			return 0;
 		sendto_serv_butone_token(IsServer(cptr) ? cptr : NULL,
 		    parv[0], MSG_HELP, TOK_HELP, "%s", message);
 		sendto_umode(UMODE_HELPOP, "*** HelpOp -- from %s: %s", parv[0],