diff --git a/earwigbot/commands/quit.py b/earwigbot/commands/quit.py
index e07d060..6d5d94a 100644
--- a/earwigbot/commands/quit.py
+++ b/earwigbot/commands/quit.py
@@ -44,13 +44,16 @@ class Command(BaseCommand):
 
     def do_quit(self, data):
         args = data.args
-        nick = self.config.irc.frontend["nick"].lower()
-        if data.trigger != nick and (not args or args[0].lower() != nick):
-            self.reply(data, "to confirm this action, the first argument must be my nickname.")
-            return
-        if args[1:]:
-            msg = " ".join(args[1:])
-            self.bot.stop("Stopped by {0}: {1}".format(data.nick, msg))
+        if data.trigger == data.my_nick:
+            reason = " ".join(args)
+        else:
+            if not args or args[0].lower() != data.my_nick:
+                self.reply(data, "to confirm this action, the first argument must be my name.")
+                return
+            reason = " ".join(args[1:])
+
+        if reason:
+            self.bot.stop("Stopped by {0}: {1}".format(data.nick, reason))
         else:
             self.bot.stop("Stopped by {0}".format(data.nick))
 
diff --git a/earwigbot/irc/data.py b/earwigbot/irc/data.py
index 83b8166..7a9cee5 100644
--- a/earwigbot/irc/data.py
+++ b/earwigbot/irc/data.py
@@ -28,7 +28,7 @@ __all__ = ["Data"]
 
 class Data(object):
     """Store data from an individual line received on IRC."""
-    
+
     def __init__(self, bot, line):
         self.line = line
         self.my_nick = bot.config.irc["frontend"]["nick"].lower()