diff --git a/Scripts/unavailable_functions.lua b/Scripts/unavailable_functions.lua
index ba8cf546f8..7d0972b757 100644
--- a/Scripts/unavailable_functions.lua
+++ b/Scripts/unavailable_functions.lua
@@ -2,4 +2,4 @@
 
 Scoring={}
 
-setmetatable(Scoring,{__index=function() return function() Warn("Lua scoring unimplemented") end end})
\ No newline at end of file
+setmetatable(Scoring,{__index=function() return function() lua.ReportScriptError("Lua scoring unimplemented") end end})
diff --git a/Themes/_fallback/Scripts/02 Actor.lua b/Themes/_fallback/Scripts/02 Actor.lua
index ff1e0e3bbf..0ab7ea29ea 100644
--- a/Themes/_fallback/Scripts/02 Actor.lua	
+++ b/Themes/_fallback/Scripts/02 Actor.lua	
@@ -408,7 +408,7 @@ DrawOrder = {
 
 -- deprecated aliases:
 function Actor:hidden(bHide)
-	Warn("hidden is deprecated, use visible instead. (used on ".. self:GetName() ..")")
+	lua.ReportScriptError("hidden is deprecated, use visible instead. (used on ".. self:GetName() ..")")
 	self:visible(not bHide)
 end
 
diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua
index 0732a42da1..3ea2c399fe 100644
--- a/Themes/_fallback/Scripts/02 Branches.lua	
+++ b/Themes/_fallback/Scripts/02 Branches.lua	
@@ -26,6 +26,14 @@ function SelectMusicOrCourse()
 	end
 end
 
+function GameOverOrContinue()
+	if THEME:GetMetric("ScreenContinue", "ContinueEnabled") then
+		return "ScreenContinue"
+	else
+		return "ScreenGameOver"
+	end
+end
+
 -- functions used for Routine mode
 function IsRoutine()
 	return GAMESTATE:GetCurrentStyle() and GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides"
@@ -126,12 +134,12 @@ Branch = {
 		if GAMESTATE:IsEventMode() then
 			return SelectMusicOrCourse()
 		elseif STATSMAN:GetCurStageStats():AllFailed() then
-			return "ScreenContinue"
+			return GameOverOrContinue()
 		elseif GAMESTATE:GetSmallestNumStagesLeftForAnyHumanPlayer() == 0 then
 			if not GAMESTATE:IsCourseMode() then
 				return "ScreenEvaluationSummary"
 			else
-				return "ScreenContinue"
+				return GameOverOrContinue()
 			end
 		else
 			return SelectMusicOrCourse()
@@ -242,7 +250,7 @@ Branch = {
 		return IsNetConnected() and "ScreenTitleMenu" or "ScreenTitleMenu"
 	end,
  	AfterSaveSummary = function()
-		return "ScreenContinue"
+		return GameOverOrContinue()
 --		[[ Enable when Finished ]]
 -- 		return GAMESTATE:AnyPlayerHasRankingFeats() and "ScreenNameEntryTraditional" or "ScreenGameOver"
 	end,
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index c3c604abfb..1ed3b79880 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -3736,6 +3736,7 @@ Class="ScreenContinue"
 Fallback="ScreenWithMenuElements"
 NextScreen=Branch.AfterContinue()
 PrevScreen=Branch.AfterContinue()
+ContinueEnabled=false
 PrepareScreens=""
 HelpText="100"
 TimerSeconds=15
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 7bc8be258a..974f07d43f 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -2043,6 +2043,7 @@ SmallBanner6OffCommand=
 [ScreenContinue]
 ShowHeader=false
 ShowFooter=false
+ContinueEnabled=true
 #
 TimerSeconds=20
 TimerMetricsGroup="MenuTimerContinue"