diff --git a/discord/ext/commands/bot.py b/discord/ext/commands/bot.py
index 82a5653db..06dedf87f 100644
--- a/discord/ext/commands/bot.py
+++ b/discord/ext/commands/bot.py
@@ -656,7 +656,7 @@ class Bot(GroupMixin, discord.Client):
                 ctx.command.dispatch_error(e, ctx)
             else:
                 self.dispatch('command_completion', command, ctx)
-        else:
+        elif invoker:
             exc = CommandNotFound('Command "{}" is not found'.format(invoker))
             self.dispatch('command_error', exc, ctx)