diff --git a/libraries/classes/server-handler.lua b/libraries/classes/server-handler.lua
index 4f0d25d..8594861 100644
--- a/libraries/classes/server-handler.lua
+++ b/libraries/classes/server-handler.lua
@@ -65,7 +65,7 @@ function server_handler:__init(client,guild,options)
     end)
   end
   self.client:on("messageCreate",function(msg)
-    if msg.guild.id == self.id then
+    if msg.guild and msg.guild.id == self.id then
       self.command_handler:handle(msg)
     end
   end)