diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 125d2b3ef7..c8a5988104 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -152,13 +152,13 @@ namespace osu.Game.Tests.NonVisual
                     Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
                     Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
 
-                    foreach (var file in osuStorage.IgnoreFiles)
+                    foreach (var file in osuStorage?.IgnoreFiles ?? Array.Empty<string>())
                     {
                         Assert.That(host.Storage.Exists(file), Is.True);
                         Assert.That(storage.Exists(file), Is.False);
                     }
 
-                    foreach (var dir in osuStorage.IgnoreDirectories)
+                    foreach (var dir in osuStorage?.IgnoreDirectories ?? Array.Empty<string>())
                     {
                         Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
                         Assert.That(storage.ExistsDirectory(dir), Is.False);
diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 17d4eb7a28..794b72b3a9 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -30,8 +30,7 @@ namespace osu.Game.Tournament.Components
         [BackgroundDependencyLoader]
         private void load(Storage storage)
         {
-            var tournamentStorage = storage as TournamentStorage;
-            var stream = tournamentStorage.VideoStore.GetStream(filename);
+            var stream = (storage as TournamentStorage)?.VideoStore.GetStream(filename);
 
             if (stream != null)
             {
diff --git a/osu.Game/IO/MigratableStorage.cs b/osu.Game/IO/MigratableStorage.cs
index 41a057d016..ec85e0bac9 100644
--- a/osu.Game/IO/MigratableStorage.cs
+++ b/osu.Game/IO/MigratableStorage.cs
@@ -14,8 +14,8 @@ namespace osu.Game.IO
     /// </summary>
     public abstract class MigratableStorage : WrappedStorage
     {
-        internal virtual string[] IgnoreDirectories => new string[] { };
-        internal virtual string[] IgnoreFiles => new string[] { };
+        internal virtual string[] IgnoreDirectories => Array.Empty<string>();
+        internal virtual string[] IgnoreFiles => Array.Empty<string>();
 
         protected MigratableStorage(Storage storage, string subPath = null)
             : base(storage, subPath)