diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
index 52bb8e51..81788b18 100644
--- a/addons/sourcemod/scripting/shavit-core.sp
+++ b/addons/sourcemod/scripting/shavit-core.sp
@@ -223,6 +223,7 @@ public void OnPluginStart()
 	gH_Forwards_OnTimerIncrementPost = CreateGlobalForward("Shavit_OnTimeIncrementPost", ET_Event, Param_Cell, Param_Cell, Param_Array);
 
 	LoadTranslations("shavit-core.phrases");
+	LoadTranslations("shavit-common.phrases");
 
 	// game types
 	gEV_Type = GetEngineVersion();
@@ -471,7 +472,10 @@ public Action Command_StartTimer(int client, int args)
 
 	else
 	{
-		Shavit_PrintToChat(client, "%T", "StartZoneUndefined", client, gS_ChatStrings.sWarning, gS_ChatStrings.sText);
+		char sTrack[32];
+		GetTrackName(client, track, sTrack, 32);
+
+		Shavit_PrintToChat(client, "%T", "StartZoneUndefined", client, gS_ChatStrings.sWarning, gS_ChatStrings.sText, gS_ChatStrings.sVariable2, sTrack, gS_ChatStrings.sText);
 	}
 
 	return Plugin_Handled;
@@ -2403,3 +2407,17 @@ void UpdateStyleSettings(int client)
 
 	SetEntityGravity(client, view_as<float>(gA_StyleSettings[gA_Timers[client].iStyle].fGravityMultiplier));
 }
+
+void GetTrackName(int client, int track, char[] output, int size)
+{
+	if(track < 0 || track >= TRACKS_SIZE)
+	{
+		FormatEx(output, size, "%T", "Track_Unknown", client);
+
+		return;
+	}
+
+	static char sTrack[16];
+	FormatEx(sTrack, 16, "Track_%d", track);
+	FormatEx(output, size, "%T", sTrack, client);
+}
diff --git a/addons/sourcemod/translations/shavit-core.phrases.txt b/addons/sourcemod/translations/shavit-core.phrases.txt
index d5ada2b1..0fe6afda 100644
--- a/addons/sourcemod/translations/shavit-core.phrases.txt
+++ b/addons/sourcemod/translations/shavit-core.phrases.txt
@@ -113,8 +113,8 @@
 	// ---------- Zones ---------- //
 	"StartZoneUndefined"
 	{
-		"#format"	"{1:s},{2:s}"
-		"en"		"Your timer {1}will not{2} start as a start zone for the map is not defined."
+		"#format"	"{1:s},{2:s},{3:s},{4:s},{5:s}"
+		"en"		"Your timer {1}will not{2} start because the {3}{4}{5} start zone is not set."
 	}
 	"EndZoneUndefined"
 	{