diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index ba9aa9e87f..84f950997d 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -12,6 +12,7 @@
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Framework.Extensions.IEnumerableExtensions;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 {
@@ -88,15 +89,10 @@ public HitObjectPatternGenerator(FastRandom random, HitObject hitObject, ManiaBe
 
         public override IEnumerable<Pattern> Generate()
         {
-            yield return generate();
-        }
-
-        private Pattern generate()
-        {
-            var pattern = new Pattern();
-
-            try
+            Pattern generateCore()
             {
+                var pattern = new Pattern();
+
                 if (TotalColumns == 1)
                 {
                     addToPattern(pattern, 0);
@@ -168,54 +164,56 @@ private Pattern generate()
                 }
 
                 if (convertType.HasFlag(PatternType.KeepSingle))
-                    return pattern = generateRandomNotes(1);
+                    return generateRandomNotes(1);
 
                 if (convertType.HasFlag(PatternType.Mirror))
                 {
                     if (ConversionDifficulty > 6.5)
-                        return pattern = generateRandomPatternWithMirrored(0.12, 0.38, 0.12);
+                        return generateRandomPatternWithMirrored(0.12, 0.38, 0.12);
                     if (ConversionDifficulty > 4)
-                        return pattern = generateRandomPatternWithMirrored(0.12, 0.17, 0);
+                        return generateRandomPatternWithMirrored(0.12, 0.17, 0);
 
-                    return pattern = generateRandomPatternWithMirrored(0.12, 0, 0);
+                    return generateRandomPatternWithMirrored(0.12, 0, 0);
                 }
 
                 if (ConversionDifficulty > 6.5)
                 {
                     if (convertType.HasFlag(PatternType.LowProbability))
-                        return pattern = generateRandomPattern(0.78, 0.42, 0, 0);
+                        return generateRandomPattern(0.78, 0.42, 0, 0);
 
-                    return pattern = generateRandomPattern(1, 0.62, 0, 0);
+                    return generateRandomPattern(1, 0.62, 0, 0);
                 }
 
                 if (ConversionDifficulty > 4)
                 {
                     if (convertType.HasFlag(PatternType.LowProbability))
-                        return pattern = generateRandomPattern(0.35, 0.08, 0, 0);
+                        return generateRandomPattern(0.35, 0.08, 0, 0);
 
-                    return pattern = generateRandomPattern(0.52, 0.15, 0, 0);
+                    return generateRandomPattern(0.52, 0.15, 0, 0);
                 }
 
                 if (ConversionDifficulty > 2)
                 {
                     if (convertType.HasFlag(PatternType.LowProbability))
-                        return pattern = generateRandomPattern(0.18, 0, 0, 0);
+                        return generateRandomPattern(0.18, 0, 0, 0);
 
-                    return pattern = generateRandomPattern(0.45, 0, 0, 0);
+                    return generateRandomPattern(0.45, 0, 0, 0);
                 }
 
-                return pattern = generateRandomPattern(0, 0, 0, 0);
+                return generateRandomPattern(0, 0, 0, 0);
             }
-            finally
+
+            var p = generateCore();
+
+            foreach (var obj in p.HitObjects)
             {
-                foreach (var obj in pattern.HitObjects)
-                {
-                    if (convertType.HasFlag(PatternType.Stair) && obj.Column == TotalColumns - 1)
-                        StairType = PatternType.ReverseStair;
-                    if (convertType.HasFlag(PatternType.ReverseStair) && obj.Column == RandomStart)
-                        StairType = PatternType.Stair;
-                }
+                if (convertType.HasFlag(PatternType.Stair) && obj.Column == TotalColumns - 1)
+                    StairType = PatternType.ReverseStair;
+                if (convertType.HasFlag(PatternType.ReverseStair) && obj.Column == RandomStart)
+                    StairType = PatternType.Stair;
             }
+
+            return p.Yield();
         }
 
         /// <summary>