diff --git a/Yapper.lua b/Yapper.lua
index dd2f469..382637d 100644
--- a/Yapper.lua
+++ b/Yapper.lua
@@ -15,7 +15,8 @@ local _L = {
         ["YAPPER_LANGUAGE_SET"] = "Yapper language set to %s",
         ["YAPPER_LANGUAGE_NOT_FOUND"] = "Yapper language not found",
         ["YAPPER_ENABLED"] = "enabled",
-        ["YAPPER_DISABLED"] = "disabled"
+        ["YAPPER_DISABLED"] = "disabled",
+        ["NO_WHISPER_TARGET"] = "Yapper found no whisper target"
     },
     ["RU"] = {
         ["NO_MESSAGE"] = "Болтун не нашел сообщение для болтовни",
@@ -30,7 +31,8 @@ local _L = {
         ["YAPPER_LANGUAGE_SET"] = "Язык Болтуна установлен на %s",
         ["YAPPER_LANGUAGE_NOT_FOUND"] = "Язык Болтуна не найден",
         ["YAPPER_ENABLED"] = "включен",
-        ["YAPPER_DISABLED"] = "выключен"
+        ["YAPPER_DISABLED"] = "выключен",
+        ["NO_WHISPER_TARGET"] = "Болтун не нашел цель для болтовни"
     }
 }
 
@@ -100,6 +102,11 @@ local function Yap()
             return
         end
     end
+    if shared.config.channel == "WHISPER" and not shared.config.channelData then
+        print(string.format(_L[shared.config.language]["NO_WHISPER_TARGET"], shared.config.channelData))
+        shared.config.enabled = false
+        return
+    end
     SendChatMessage(shared.config.message, shared.config.channel, nil, data)
 
     if not shared.config.interval or shared.config.interval <= 0 then
@@ -174,13 +181,16 @@ SlashCmdList["YAPPER_CHANNEL_CMD"] = function(input)
     if #data == 1 then
         shared.config.channel = string.upper(data[1])
         shared.config.channelData = nil
-        print(string.format(_L[shared.config.language]["YAPPER_CHANNEL_SET"], shared.config.channel))
+        print(string.format(_L[shared.config.language]["YAPPER_CHANNEL_SET"],
+            tostring(shared.config.channel),
+            tostring(shared.config.channelData)))
         return
     end
     shared.config.channel = string.upper(data[1])
     shared.config.channelData = data[2]
-    print(string.format(_L[shared.config.language]["YAPPER_CHANNEL_SET"], shared.config.channel,
-        shared.config.channelData))
+    print(string.format(_L[shared.config.language]["YAPPER_CHANNEL_SET"],
+        tostring(shared.config.channel),
+        tostring(shared.config.channelData)))
 end
 SLASH_YAPPER_CHANNEL_CMD1 = "/yapc"