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/ExpGamingCommands/home/control.lua b/modules/ExpGamingCommands/home/control.lua
index d5c667fb..53b9481b 100644
--- a/modules/ExpGamingCommands/home/control.lua
+++ b/modules/ExpGamingCommands/home/control.lua
@@ -24,12 +24,12 @@ commands.add_command('home', 'Allows you to set, remove and goto your homes', {
         homes._n=homes._n+1
         player_return{'ExpGamingCommands-home.set',name,pos[1],pos[2]}
     elseif command == 'remove' then
-        if not homes[name] then player_return{'ExpGamingCommands-home.invalid',name} end
+        if not homes[name] then player_return{'ExpGamingCommands-home.invalid',name} return commands.error end
         homes[name] = nil
         homes._n=homes._n-1
         player_return{'ExpGamingCommands-home.remove',name}
     elseif command == 'goto' then
-        if not homes[name] then player_return{'ExpGamingCommands-home.invalid',name} end
+        if not homes[name] then player_return{'ExpGamingCommands-home.invalid',name} return commands.error end
         local pos = {math.floor(player.position.x),math.floor(player.position.y)}
         player.teleport(player.surface.find_non_colliding_position('player',homes[name],32,1),player.surface)
         homes._r = pos
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