diff --git a/Bugtracker/__init__.py b/Bugtracker/__init__.py
index d6bdf37..8ef6cce 100644
--- a/Bugtracker/__init__.py
+++ b/Bugtracker/__init__.py
@@ -24,7 +24,7 @@ import supybot.world as world
 
 from imp import reload
 
-__version__ = "3.5.0"
+__version__ = "3.6.0"
 __author__ = supybot.Author("Krytarik Raido", "krytarik", "krytarik@tuxgarage.com")
 __contributors__ = {
     supybot.Author("Dennis Kaarsemaker", "Seveas", "dennis@kaarsemaker.net"): ['Original Author'],
diff --git a/Bugtracker/plugin.py b/Bugtracker/plugin.py
index f0c0e3e..10e59f7 100644
--- a/Bugtracker/plugin.py
+++ b/Bugtracker/plugin.py
@@ -410,8 +410,8 @@ class Bugtracker(callbacks.PluginRegexp):
                 name = self.shorthand[snarfTarget.lower()]
                 tracker = self.db[name]
             except:
-                s = self.registryValue('replyNoBugtracker', name)
-                irc.error(s % name)
+                s = self.registryValue('replyNoBugtracker', channel)
+                irc.error(s % (name or snarfTarget))
                 return
 
         for bugid in bugids: