diff --git a/Changes b/Changes
index f00d04cdf..ca25354d9 100644
--- a/Changes
+++ b/Changes
@@ -598,3 +598,4 @@
 - ./update now checks when you specify wget if it exists, if not it tries lynx
 - Cached MOTDs are now dynamically allocated (saves alot of memory)
 - Made aClient->passwd dynamically allocated (saves 32bytes per user/server) [may need debugging]
+- Fixed a NOTICE crash bug, reported by EJ
diff --git a/src/s_user.c b/src/s_user.c
index 29c250fbd..804743971 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -2319,7 +2319,8 @@ int  m_notice(cptr, sptr, parc, parv)
 		return 0;
 	}
       temp:
-	return m_message(cptr, sptr, parc, parv, 1);
+	if (sptr->name[0])
+		return m_message(cptr, sptr, parc, parv, 1);
 }
 
 int  channelwho = 0;