diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index 122ae505ca..6ebee209e2 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Game.Rulesets.UI;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
@@ -26,6 +27,8 @@ namespace osu.Game.Screens.Play
         public Action OnComplete;
 
         private readonly DrawableRuleset drawableRuleset;
+
+        [NotNull]
         private readonly ITrack track;
 
         private readonly BindableDouble trackFreq = new BindableDouble(1);
@@ -34,7 +37,7 @@ namespace osu.Game.Screens.Play
 
         private SampleChannel failSample;
 
-        public FailAnimation(DrawableRuleset drawableRuleset, ITrack track)
+        public FailAnimation(DrawableRuleset drawableRuleset, [NotNull] ITrack track)
         {
             this.drawableRuleset = drawableRuleset;
             this.track = track;
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index c4f368e1f5..f3466a562e 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework;
@@ -27,6 +28,7 @@ namespace osu.Game.Screens.Play
         private readonly WorkingBeatmap beatmap;
         private readonly IReadOnlyList<Mod> mods;
 
+        [NotNull]
         private ITrack track;
 
         public readonly BindableBool IsPaused = new BindableBool();
@@ -60,7 +62,7 @@ namespace osu.Game.Screens.Play
 
         private readonly FramedOffsetClock platformOffsetClock;
 
-        public GameplayClockContainer(ITrack track, WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
+        public GameplayClockContainer([NotNull] ITrack track, WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
         {
             this.beatmap = beatmap;
             this.mods = mods;
@@ -196,9 +198,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public void StopUsingBeatmapClock()
         {
-            if (track == null)
-                return;
-
             removeSourceClockAdjustments();
 
             track = new TrackVirtual(track.Length);
@@ -217,8 +216,6 @@ namespace osu.Game.Screens.Play
 
         private void updateRate()
         {
-            if (track == null) return;
-
             speedAdjustmentsApplied = true;
             track.ResetSpeedAdjustments();
 
@@ -233,7 +230,6 @@ namespace osu.Game.Screens.Play
         {
             base.Dispose(isDisposing);
             removeSourceClockAdjustments();
-            track = null;
         }
 
         private void removeSourceClockAdjustments()