diff --git a/core/bot.py b/core/bot.py
index f831286..0bb64b2 100644
--- a/core/bot.py
+++ b/core/bot.py
@@ -221,7 +221,8 @@ class IRCBot(IRCClient):
 
         # expand out the hostmask
         if not {"nick", "ident", "host"}.issubset(set(cast.keys())):
-            cast["nick"], cast["ident"], cast["host"] = parsen(cast["muser"])
+            if "muser" in cast.keys():
+                cast["nick"], cast["ident"], cast["host"] = parsen(cast["muser"])
 
         # handle ZNC stuff
         if {"nick", "ident", "host", "msg"}.issubset(set(cast)):
diff --git a/modules/monitor.py b/modules/monitor.py
index 4b3d581..e9dea5a 100644
--- a/modules/monitor.py
+++ b/modules/monitor.py
@@ -18,7 +18,8 @@ def parsemeta(numName, c):
     # need to check if this was received from a relay
     #  in which case, do not do this
     if c["type"] in ["msg", "notice", "action", "topic", "mode"]:
-        userinfo.editUser(c["net"], c["muser"])
+        if "muser" in c.keys():
+            userinfo.editUser(c["net"], c["muser"])
         #if c["type"] == "mode":
         #    userinfo.updateMode(c)
     elif c["type"] == "nick":