diff --git a/FreshShit/ChannelJoiner/init.lua b/FreshShit/ChannelJoiner/init.lua
index a0e4e29..c532747 100644
--- a/FreshShit/ChannelJoiner/init.lua
+++ b/FreshShit/ChannelJoiner/init.lua
@@ -63,15 +63,30 @@ aura_env.FindOrCreateChatWindow = function()
 	for i = 1, NUM_CHAT_WINDOWS do
 		local name = GetChatWindowInfo(i)
 		if name == chatFrameName then
-			return _G["ChatFrame" .. i]
+			print(string.format("Found chat window %s", name))
+			local frame = _G["ChatFrame" .. i]
+			if FCF_IsValidChatFrame(frame) then
+				print(string.format("Frame %s is valid", name))
+				return frame
+			else
+				print(string.format("Frame %s is invalid", name))
+			end
 		end
 	end
 
+	print("Opening new chat window")
 	FCF_OpenNewWindow(chatFrameName)
 	for i = 1, NUM_CHAT_WINDOWS do
 		local name = GetChatWindowInfo(i)
 		if name == chatFrameName then
-			return _G["ChatFrame" .. i]
+			print(string.format("Found chat window %s", name))
+			local frame = _G["ChatFrame" .. i]
+			if FCF_IsValidChatFrame(frame) then
+				print(string.format("Frame %s is valid", name))
+				return frame
+			else
+				print(string.format("Frame %s is invalid", name))
+			end
 		end
 	end