diff --git a/plugins/Infobot.py b/plugins/Infobot.py
index e5df40300..4b6d45121 100755
--- a/plugins/Infobot.py
+++ b/plugins/Infobot.py
@@ -474,6 +474,9 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
     _forceRe = re.compile(r'^no[,: -]+', re.I)
     _karmaRe = re.compile(r'^(?:\S+|\(.+\))(?:\+\+|--)(?:\s+)?$')
     def doPrivmsg(self, irc, msg):
+        if msg.repliedTo:
+            self.log.debug('Returning early from doPrivmsg, msg.repliedTo.')
+            return
         try:
             if ircmsgs.isCtcp(msg):
                 return
@@ -595,9 +598,6 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
             # Does the dunno'ing for us itself.
             self.factoid(key, prepend=random.choice(starts))
 
-    def invalidCommand(self, irc, msg, tokens):
-            irc.finished = True
-
     def doFactoid(self, irc, msg, match):
         r"^(.+?)\s+(?<!\\)(was|is|am|were|are)\s+(also\s+)?(.+?)[?!. ]*$"
         (key, isAre, also, value) = match.groups()
diff --git a/src/privmsgs.py b/src/privmsgs.py
index ac172b37d..cc278867d 100644
--- a/src/privmsgs.py
+++ b/src/privmsgs.py
@@ -184,6 +184,9 @@ class SnarfIrc(object):
 def urlSnarfer(f):
     """Protects the snarfer from loops and whatnot."""
     def newf(self, irc, msg, match, *L, **kwargs):
+        if msg.repliedTo:
+            self.log.debug('Not calling snarfer, msg is already repliedTo.')
+            return
         channel = msg.args[0]
         if not ircutils.isChannel(channel):
             return