diff --git a/src/CatSession.cc b/src/CatSession.cc
index 9de9ea14..35c01045 100644
--- a/src/CatSession.cc
+++ b/src/CatSession.cc
@@ -37,7 +37,7 @@ CatSession::CatSession(
     GameVersion version,
     shared_ptr<const PSOBBEncryption::KeyFile> bb_key_file)
     : Shell(base),
-      log("[CatSession] ", proxy_server_log.min_level),
+      log(string_printf("[CatSession:%s] ", name_for_version(version)), proxy_server_log.min_level),
       channel(
           version,
           1,
diff --git a/src/Episode3/Tournament.cc b/src/Episode3/Tournament.cc
index f2a767f8..4a380798 100644
--- a/src/Episode3/Tournament.cc
+++ b/src/Episode3/Tournament.cc
@@ -318,7 +318,7 @@ Tournament::Tournament(
     const Rules& rules,
     size_t num_teams,
     uint8_t flags)
-    : log(string_printf("[Tournament/%s] ", name.c_str())),
+    : log(string_printf("[Tournament:%s] ", name.c_str())),
       map_index(map_index),
       com_deck_index(com_deck_index),
       name(name),
@@ -343,7 +343,7 @@ Tournament::Tournament(
     shared_ptr<const MapIndex> map_index,
     shared_ptr<const COMDeckIndex> com_deck_index,
     const JSON& json)
-    : log(string_printf("[Tournament/%s] ", json.get_string("name").c_str())),
+    : log(string_printf("[Tournament:%s] ", json.get_string("name").c_str())),
       map_index(map_index),
       com_deck_index(com_deck_index),
       source_json(json),
diff --git a/src/ItemCreator.cc b/src/ItemCreator.cc
index bbfacc29..1285fc46 100644
--- a/src/ItemCreator.cc
+++ b/src/ItemCreator.cc
@@ -23,7 +23,7 @@ ItemCreator::ItemCreator(
     uint8_t section_id,
     uint32_t random_seed,
     shared_ptr<const BattleRules> restrictions)
-    : log("[ItemCreator] "),
+    : log(string_printf("[ItemCreator:%s/%s/%s/%c/%hhu] ", name_for_version(version), abbreviation_for_episode(episode), abbreviation_for_mode(mode), abbreviation_for_difficulty(difficulty), section_id)),
       version(version),
       episode(episode),
       mode(mode),
diff --git a/src/ItemParameterTable.cc b/src/ItemParameterTable.cc
index 9697c7e7..a03ada5d 100644
--- a/src/ItemParameterTable.cc
+++ b/src/ItemParameterTable.cc
@@ -404,7 +404,7 @@ pair<uint8_t, uint8_t> ItemParameterTable::find_tool_by_id_t(uint32_t tool_table
       }
     }
   }
-  throw runtime_error("invalid tool class");
+  throw runtime_error(string_printf("invalid tool class %08" PRIX32, item_id));
 }
 
 pair<uint8_t, uint8_t> ItemParameterTable::find_tool_by_id(uint32_t item_id) const {
diff --git a/src/Lobby.cc b/src/Lobby.cc
index ef7e6d9c..b80fc924 100644
--- a/src/Lobby.cc
+++ b/src/Lobby.cc
@@ -12,7 +12,7 @@ using namespace std;
 
 Lobby::Lobby(shared_ptr<ServerState> s, uint32_t id)
     : server_state(s),
-      log(string_printf("[Lobby/%" PRIX32 "] ", id), lobby_log.min_level),
+      log(string_printf("[Lobby:%" PRIX32 "] ", id), lobby_log.min_level),
       lobby_id(id),
       min_level(0),
       max_level(0xFFFFFFFF),