diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index adb3b4464..537f7126b 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -10617,37 +10617,28 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 	case RaidCommandInviteIntoExisting:
 	case RaidCommandInvite: {
 		Client *i = entity_list.GetClientByName(ri->player_name);
-		if (i){
-			Group *g = i->GetGroup();
-			if (g){
-				if (g->IsLeader(i) == false)
-					Message(13, "You can only invite an ungrouped player or group leader to join your raid.");
-				else{
-					//This sends an "invite" to the client in question.
-					EQApplicationPacket* outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(RaidGeneral_Struct));
-					RaidGeneral_Struct *rg = (RaidGeneral_Struct*)outapp->pBuffer;
-					strn0cpy(rg->leader_name, ri->leader_name, 64);
-					strn0cpy(rg->player_name, ri->player_name, 64);
-
-					rg->parameter = 0;
-					rg->action = 20;
-					i->QueuePacket(outapp);
-					safe_delete(outapp);
-				}
-			}
-			else{
-				//This sends an "invite" to the client in question.
-				EQApplicationPacket* outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(RaidGeneral_Struct));
-				RaidGeneral_Struct *rg = (RaidGeneral_Struct*)outapp->pBuffer;
-				strn0cpy(rg->leader_name, ri->leader_name, 64);
-				strn0cpy(rg->player_name, ri->player_name, 64);
-
-				rg->parameter = 0;
-				rg->action = 20;
-				i->QueuePacket(outapp);
-				safe_delete(outapp);
-			}
+		if (!i)
+			break;
+		Group *g = i->GetGroup();
+		// These two messages should be generated by the client I think, just do this for now
+		if (i->HasRaid()) {
+			Message(13, "%s is already in a raid.", i->GetName());
+			break;
 		}
+		if (g && !g->IsLeader(i)) {
+			Message(13, "You can only invite an ungrouped player or group leader to join your raid.");
+			break;
+		}
+		//This sends an "invite" to the client in question.
+		EQApplicationPacket* outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(RaidGeneral_Struct));
+		RaidGeneral_Struct *rg = (RaidGeneral_Struct*)outapp->pBuffer;
+		strn0cpy(rg->leader_name, ri->leader_name, 64);
+		strn0cpy(rg->player_name, ri->player_name, 64);
+
+		rg->parameter = 0;
+		rg->action = 20;
+		i->QueuePacket(outapp);
+		safe_delete(outapp);
 		break;
 	}
 	case RaidCommandAcceptInvite: {