diff --git a/Heimdall.zip b/Heimdall.zip
index 2b4b37f..bb054fc 100644
--- a/Heimdall.zip
+++ b/Heimdall.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f820ce2dec9c7e4f4bfad32dc83a56d6e36fde437d243502ec09b6998e363fbf
-size 19076
+oid sha256:883378cad3fe389bd033fe5ed99f5a9e781461e41a3d25124ce55503a1998d26
+size 20088
diff --git a/Modules/Whoer.lua b/Modules/Whoer.lua
index 0caeada..ec43037 100644
--- a/Modules/Whoer.lua
+++ b/Modules/Whoer.lua
@@ -478,7 +478,16 @@ function shared.Whoer.Init()
 		if not Heimdall_Data.config.who.enabled then return end
 		if msg == "who" then
 			local messages = WhoPartitioned(HeimdallStinkies)
-			for _, message in pairs(messages) do
+			if #messages == 0 then
+				---@type Message
+				local msg = {
+					channel = "WHISPER",
+					data = sender,
+					message = "who: No stinkies found"
+				}
+				table.insert(shared.messenger.queue, msg)
+			end
+			for _, message in ipairs(messages) do
 				---@type Message
 				local msg = {
 					channel = "WHISPER",
@@ -490,7 +499,16 @@ function shared.Whoer.Init()
 		end
 		if msg == "howmany" then
 			local messages = CountPartitioned(HeimdallStinkies)
-			for _, message in pairs(messages) do
+			if #messages == 0 then
+				---@type Message
+				local msg = {
+					channel = "WHISPER",
+					data = sender,
+					message = "howmany: No stinkies found"
+				}
+				table.insert(shared.messenger.queue, msg)
+			end
+			for _, message in ipairs(messages) do
 				---@type Message
 				local msg = {
 					channel = "WHISPER",
@@ -502,7 +520,16 @@ function shared.Whoer.Init()
 		end
 		if msg == "classes" then
 			local messages = CountClassPartitioned(HeimdallStinkies)
-			for _, message in pairs(messages) do
+			if #messages == 0 then
+				---@type Message
+				local msg = {
+					channel = "WHISPER",
+					data = sender,
+					message = "classes: No stinkies found"
+				}
+				table.insert(shared.messenger.queue, msg)
+			end
+			for _, message in ipairs(messages) do
 				---@type Message
 				local msg = {
 					channel = "WHISPER",
@@ -547,7 +574,16 @@ function shared.Whoer.Init()
 
 		if msg == "who" then
 			local messages = WhoPartitioned(HeimdallStinkies)
-			for _, message in pairs(messages) do
+			if #messages == 0 then
+				---@type Message
+				local msg = {
+					channel = "CHANNEL",
+					data = channelname,
+					message = "who: No stinkies found"
+				}
+				table.insert(shared.messenger.queue, msg)
+			end
+			for _, message in ipairs(messages) do
 				---@type Message
 				local msg = {
 					channel = "CHANNEL",
@@ -559,7 +595,16 @@ function shared.Whoer.Init()
 		end
 		if msg == "howmany" then
 			local messages = CountPartitioned(HeimdallStinkies)
-			for _, message in pairs(messages) do
+			if #messages == 0 then
+				---@type Message
+				local msg = {
+					channel = "CHANNEL",
+					data = channelname,
+					message = "howmany: No stinkies found"
+				}
+				table.insert(shared.messenger.queue, msg)
+			end
+			for _, message in ipairs(messages) do
 				---@type Message
 				local msg = {
 					channel = "CHANNEL",
@@ -571,7 +616,16 @@ function shared.Whoer.Init()
 		end
 		if msg == "classes" then
 			local messages = CountClassPartitioned(HeimdallStinkies)
-			for _, message in pairs(messages) do
+			if #messages == 0 then
+				---@type Message
+				local msg = {
+					channel = "CHANNEL",
+					data = channelname,
+					message = "classes: No stinkies found"
+				}
+				table.insert(shared.messenger.queue, msg)
+			end
+			for _, message in ipairs(messages) do
 				---@type Message
 				local msg = {
 					channel = "CHANNEL",
@@ -582,7 +636,7 @@ function shared.Whoer.Init()
 			end
 		end
 		if msg == "help" then
-			for _, helpMessage in pairs(helpMessages) do
+			for _, helpMessage in ipairs(helpMessages) do
 				---@type Message
 				local msg = {
 					channel = "CHANNEL",