diff --git a/src/OwnerCommands.py b/src/OwnerCommands.py
index e2fde818e..cf179bd2c 100644
--- a/src/OwnerCommands.py
+++ b/src/OwnerCommands.py
@@ -55,6 +55,8 @@ class OwnerCommands(privmsgs.CapabilityCheckingPrivmsg):
             s = privmsgs.getArgs(args)
             try:
                 irc.reply(msg, repr(eval(s)))
+            except SyntaxError, e:
+                irc.reply(msg, '%s: %r' % (debug.exnToString(e), s))
             except Exception, e:
                 irc.reply(msg, debug.exnToString(e))
         else:
diff --git a/src/callbacks.py b/src/callbacks.py
index 455818a9e..678e1564e 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -281,7 +281,8 @@ class IrcObjectProxy:
 
     def finalEval(self):
         self.finalEvaled = True
-        name = canonicalName(self.args.pop(0))
+        originalName = self.args.pop(0)
+        name = canonicalName(originalName)
         callback = self.findCallback(name)
         try:
             if callback is not None:
@@ -304,7 +305,7 @@ class IrcObjectProxy:
                 command = getattr(callback, name)
                 callback.callCommand(command, self, self.msg, self.args)
             else:
-                self.args.insert(0, name)
+                self.args.insert(0, originalName)
                 if not isinstance(self.irc, irclib.Irc):
                     # If self.irc is an actual irclib.Irc, then this is the
                     # first command given, and should be ignored as usual.
diff --git a/test/test_OwnerCommands.py b/test/test_OwnerCommands.py
new file mode 100644
index 000000000..ab31e0e36
--- /dev/null
+++ b/test/test_OwnerCommands.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+
+###
+# Copyright (c) 2002, Jeremiah Fincher
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+###
+
+from test import *
+
+import conf
+
+class OwnerCommandsTestCase(PluginTestCase):
+    plugins = ('OwnerCommands',)
+
+    def testEval(self):
+        conf.allowEval = True
+        s = "[irc.__class__ for irc in " \
+            "irc.getCallback('Relay').ircstates.keys()]" 
+        self.assertNotRegexp('eval ' + s, '^SyntaxError')
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+