diff --git a/zone/guild.cpp b/zone/guild.cpp
index 72fd2bb1d..ab47427e9 100644
--- a/zone/guild.cpp
+++ b/zone/guild.cpp
@@ -146,13 +146,20 @@ void Client::SendGuildRankNames()
 {
 	if (IsInAGuild() && (ClientVersion() >= EQ::versions::ClientVersion::RoF)) {
 		auto guild = guild_mgr.GetGuildByGuildID(GuildID());
+		if (!guild) {
+			return;
+		}
 
 		for (int i = 1; i <= GUILD_MAX_RANK; i++) {
 
 			auto                 outapp = new EQApplicationPacket(OP_GuildUpdate, sizeof(GuildUpdateUCPStruct));
-			GuildUpdateUCPStruct *gucp  = (GuildUpdateUCPStruct *) outapp->pBuffer;
+			GuildUpdateUCPStruct* gucp = (GuildUpdateUCPStruct*)outapp->pBuffer;
 
 			gucp->payload.rank_name.rank = i;
+			if (guild->rank_names[i].empty()) {
+				continue;
+			}
+
 			strn0cpy(
 				gucp->payload.rank_name.rank_name,
 				guild->rank_names[i].c_str(),