diff --git a/Changes b/Changes
index fe87226e6..aa388fa26 100644
--- a/Changes
+++ b/Changes
@@ -445,3 +445,4 @@
 - Removed an excess space from the SAMODE notice when a mode without a parameter was set
   (#0002134) reported by Bugz.
 - Fixed small memory leak on /rehash (post-3.2.2).
+- Fixed botmotd crash due to last change (post-3.2.2).
diff --git a/src/s_serv.c b/src/s_serv.c
index ff1d83324..5c5479b85 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -1356,7 +1356,10 @@ CMD_FUNC(m_botmotd)
 	    parv) != HUNTED_ISME)
 		return 0;
 
-	strlcpy(userhost,make_user_host(cptr->user->username, cptr->user->realhost), sizeof userhost);
+	if (!IsPerson(sptr))
+		return 0;
+
+	strlcpy(userhost,make_user_host(sptr->user->username, sptr->user->realhost), sizeof userhost);
 	ptr = Find_tld(sptr, userhost);
 
 	if (ptr)