diff --git a/osu-framework b/osu-framework
index a617245a42..0fe1e50b38 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit a617245a4261d7d6e138c2fddbbeaa7940d24ca7
+Subproject commit 0fe1e50b38ff9ce8aceba231eede3333cb73bb23
diff --git a/osu.Game.Rulesets.Osu/OsuDifficulty/Preprocessing/OsuDifficultyBeatmap.cs b/osu.Game.Rulesets.Osu/OsuDifficulty/Preprocessing/OsuDifficultyBeatmap.cs
index 72ba421344..c6ecc3a506 100644
--- a/osu.Game.Rulesets.Osu/OsuDifficulty/Preprocessing/OsuDifficultyBeatmap.cs
+++ b/osu.Game.Rulesets.Osu/OsuDifficulty/Preprocessing/OsuDifficultyBeatmap.cs
@@ -51,6 +51,7 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
 
                     foreach (OsuDifficultyHitObject h in onScreen)
                     {
+                        // ReSharper disable once PossibleNullReferenceException (resharper not smart enough to understand IEnumerator.MoveNext())
                         h.TimeUntilHit -= latest.DeltaTime;
                         // Calculate reading strain here
                     }
diff --git a/osu.Game/Screens/Play/KeyCounterCollection.cs b/osu.Game/Screens/Play/KeyCounterCollection.cs
index 0f6c5984c4..d21be71785 100644
--- a/osu.Game/Screens/Play/KeyCounterCollection.cs
+++ b/osu.Game/Screens/Play/KeyCounterCollection.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Screens.Play
 
         public override void Add(KeyCounter key)
         {
+            if (key == null) throw new ArgumentNullException(nameof(key));
+
             base.Add(key);
             key.IsCounting = IsCounting;
             key.FadeTime = FadeTime;