diff --git a/bot.py b/bot.py
index ff66b8a..42b4576 100644
--- a/bot.py
+++ b/bot.py
@@ -415,11 +415,11 @@ class Bot:
             return self.treat_prvmsg_ask(msg, srv)
 
         # Owner commands
-        elif msg.content[0] == '`' and msg.nick == srv.owner:
+        elif len(msg.content) > 0 and msg.content[0] == '`' and msg.nick == srv.owner:
             #TODO: owner commands
             pass
 
-        elif msg.content[0] == '!' and len(msg.content) > 1:
+        elif len(msg.content) > 0 and msg.content[0] == '!' and len(msg.content) > 1:
             # Remove the !
             msg.cmds[0] = msg.cmds[0][1:]
 
diff --git a/modules/alias.py b/modules/alias.py
index 7aebef5..cd5eb5e 100644
--- a/modules/alias.py
+++ b/modules/alias.py
@@ -154,7 +154,8 @@ def treat_variables(res):
     return True
 
 def treat_alias(msg, hooks_cache):
-    if msg.cmd == "PRIVMSG" and (len(msg.cmds[0]) > 0 and msg.cmds[0][0] == "!"
+    if msg.cmd == "PRIVMSG" and len(msg.cmds) > 0 and (len(msg.cmds[0]) > 0
+        and msg.cmds[0][0] == "!"
         and msg.cmds[0][1:] in DATAS.getNode("aliases").index
         and msg.cmds[0][1:] not in hooks_cache("cmd_hook")):
         msg.content = msg.content.replace(msg.cmds[0],