diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp
index 75bc35a7..f3eba2bb 100644
--- a/addons/sourcemod/scripting/shavit-misc.sp
+++ b/addons/sourcemod/scripting/shavit-misc.sp
@@ -1692,6 +1692,13 @@ bool SaveCheckpoint(int client, int index)
 		int style = Shavit_GetReplayBotStyle(target);
 		int track = Shavit_GetReplayBotTrack(target);
 
+		if(style < 0 || track < 0)
+		{
+			Shavit_PrintToChat(client, "%T", "CommandAliveSpectate", client, gS_ChatStrings[sMessageVariable], gS_ChatStrings[sMessageText], gS_ChatStrings[sMessageVariable], gS_ChatStrings[sMessageText]);
+			
+			return false;
+		}
+
 		snapshot[bTimerEnabled] = true;
 		snapshot[fCurrentTime] = Shavit_GetReplayTime(style, track);
 		snapshot[bClientPaused] = false;
diff --git a/addons/sourcemod/scripting/shavit-replay.sp b/addons/sourcemod/scripting/shavit-replay.sp
index ab653a21..fdc096e8 100644
--- a/addons/sourcemod/scripting/shavit-replay.sp
+++ b/addons/sourcemod/scripting/shavit-replay.sp
@@ -401,6 +401,11 @@ public int Native_GetReplayTime(Handle handler, int numParams)
 	int style = GetNativeCell(1);
 	int track = GetNativeCell(2);
 
+	if(style < 0 || track < 0)
+	{
+		return view_as<int>(0.0);
+	}
+
 	if(gB_CentralBot)
 	{
 		if(gA_CentralCache[iCentralReplayStatus] == Replay_End)