diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index d09e6e683..7c770d87a 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -11146,9 +11146,11 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app)
 			break;
 
 		case POPUPID_DIAWIND:
-			response = GetEntityVariable(DIAWIND_RESPONSE_KEY.c_str());
-			if (!response.empty()) {
-				ChannelMessageReceived(8, 0, 100, response.c_str());
+			if (EntityVariableExists(DIAWIND_RESPONSE_KEY.c_str())) {
+				response = GetEntityVariable(DIAWIND_RESPONSE_KEY.c_str());
+				if (!response.empty()) {
+					ChannelMessageReceived(8, 0, 100, response.c_str());
+				}
 			}
 			break;