diff --git a/exp_scenario/module/control/extra_logging.lua b/exp_scenario/module/control/extra_logging.lua
index aaacd3d1f0..4a9da9dbab 100644
--- a/exp_scenario/module/control/extra_logging.lua
+++ b/exp_scenario/module/control/extra_logging.lua
@@ -37,8 +37,11 @@ local function on_pre_player_died(event)
     local player = assert(game.get_player(event.player_index))
     local cause = event.cause
     if cause then
-        local by_player = event.cause.player
-        add_log_line("[DEATH]", player.name, "died because of", by_player and by_player.name or event.cause.name)
+        if cause.type == "character" then
+            add_log_line("[DEATH]", player.name, "died because of", (cause.player and cause.player.name) or cause.name)
+        else
+            add_log_line("[DEATH]", player.name, "died because of", cause.name)
+        end
     else
         add_log_line("[DEATH]", player.name, "died because of unknown reason")
     end
@@ -52,9 +55,9 @@ local function on_research_finished(event)
 
     local inf_research_level = config_res.inf_res[config_res.mod_set][event.research.name]
     if inf_research_level and event.research.level >= inf_research_level then
-        add_log_line_locale{ "", "[RES] ", event.research.prototype.localised_name, " at level ", event.research.level - 1, "has been researched\n" }
+        add_log_line_locale{ "", "[RES]", event.research.prototype.localised_name, " at level ", event.research.level - 1, " has been researched\n" }
     else
-        add_log_line_locale{ "", "[RES] ", event.research.prototype.localised_name, "has been researched\n" }
+        add_log_line_locale{ "", "[RES]", event.research.prototype.localised_name, " has been researched\n" }
     end
 end
 
@@ -67,7 +70,7 @@ end
 --- @param event EventData.on_player_left_game
 local function on_player_left_game(event)
     local player = assert(game.get_player(event.player_index))
-    add_log_line("[LEAVE]", game.players[event.player_index].name, config.disconnect_reason[event.reason])
+    add_log_line("[LEAVE]", player.name, config.disconnect_reason[event.reason])
 end
 
 local e = defines.events