diff --git a/modules/ExpGamingAdmin/Kick/control.lua b/modules/ExpGamingAdmin/Kick/control.lua
index e36eef2e..33fdf2c8 100644
--- a/modules/ExpGamingAdmin/Kick/control.lua
+++ b/modules/ExpGamingAdmin/Kick/control.lua
@@ -27,8 +27,8 @@ end)
 
 function Admin.kick(player,by_player,reason)
     player = Game.get_player(player)
-    reason = Admin.create_reason(reason,by_player_name)
     local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '<server>'
+    reason = Admin.create_reason(reason,by_player_name)
     if Sync then Sync.emit_embedded{
         title='Player Kick',
         color=Color.to_hex(defines.textcolor.high),
diff --git a/modules/ExpGamingCore/Server/control.lua b/modules/ExpGamingCore/Server/control.lua
index 7e5cccc6..bcc6d57c 100644
--- a/modules/ExpGamingCore/Server/control.lua
+++ b/modules/ExpGamingCore/Server/control.lua
@@ -457,7 +457,8 @@ function Server._thread:error(err)
         _return = true
     else 
         self:close() -- no matter what happens next this thread will be closed
-        error('Thread Error (no handler): '..err)
+        local name = self.name or self.uuid
+        error('Thread Error (no handler) on <'..name..'>: '..err)
     end
     return _return
 end