diff --git a/src/callbacks.py b/src/callbacks.py
index be7ebf361..a0d8ddb8e 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -214,7 +214,10 @@ def getHelp(method, name=None, doc=None):
     if name is None:
         name = method.__name__
     if doc is None:
-        doclines = method.__doc__.splitlines()
+        if method.__doc__ is None:
+            doclines = ['This command has no help.  Complain to the author.']
+        else:
+            doclines = method.__doc__.splitlines()
     else:
         doclines = doc.splitlines()
     s = '%s %s' % (name, doclines.pop(0))
diff --git a/test/test_callbacks.py b/test/test_callbacks.py
index 4d1c815b9..60d5d4138 100644
--- a/test/test_callbacks.py
+++ b/test/test_callbacks.py
@@ -550,6 +550,9 @@ class SourceNestedPluginTestCase(PluginTestCase):
             """
             irc.reply('f')
 
+        def empty(self, irc, msg, args):
+            pass
+
         class g(callbacks.Commands):
             def h(self, irc, msg, args):
                 """takes no arguments
@@ -588,6 +591,7 @@ class SourceNestedPluginTestCase(PluginTestCase):
         self.assertResponse('e g h', 'h')
         self.assertResponse('e g i j', 'j')
         self.assertHelp('help f')
+        self.assertHelp('help empty')
         self.assertHelp('help same')
         self.assertHelp('help e g h')
         self.assertHelp('help e g i j')