diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index fb26739a44..e1a29946f4 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -125,6 +125,7 @@ namespace osu.Game.Screens
private BackgroundScreen background;
[Resolved(canBeNull: true)]
+ [CanBeNull]
private BackgroundScreenStack backgroundStack { get; set; }
[Resolved(canBeNull: true)]
@@ -152,8 +153,11 @@ namespace osu.Game.Screens
/// The operation to perform.
public void ApplyToBackground(Action action)
{
+ if (backgroundStack == null)
+ throw new InvalidOperationException("Attempted to apply to background without a background stack being available.");
+
if (background == null)
- throw new InvalidOperationException("Attempted to apply to background before screen is pushed");
+ throw new InvalidOperationException("Attempted to apply to background before screen is pushed.");
background.ApplyToBackground(action);
}