diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index c869fd1bad..36dcd4f8e8 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -43,11 +43,17 @@ namespace osu.Game.Beatmaps
 
         private readonly RealmContextFactory contextFactory;
 
-        public BeatmapManager(Storage storage, RealmContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, AudioManager audioManager, IResourceStore<byte[]> gameResources, GameHost? host = null, WorkingBeatmap? defaultBeatmap = null, bool performOnlineLookups = false)
+        public BeatmapManager(Storage storage, RealmContextFactory contextFactory, RulesetStore rulesets, IAPIProvider? api, AudioManager audioManager, IResourceStore<byte[]> gameResources, GameHost? host = null, WorkingBeatmap? defaultBeatmap = null, bool performOnlineLookups = false)
         {
             this.contextFactory = contextFactory;
+
             if (performOnlineLookups)
+            {
+                if (api == null)
+                    throw new ArgumentNullException(nameof(api), "API must be provided if online lookups are required.");
+
                 onlineBeatmapLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
+            }
 
             var userResources = new RealmFileStore(contextFactory, storage).Store;
 
@@ -56,7 +62,6 @@ namespace osu.Game.Beatmaps
             beatmapModelManager = CreateBeatmapModelManager(storage, contextFactory, rulesets, onlineBeatmapLookupQueue);
             workingBeatmapCache = CreateWorkingBeatmapCache(audioManager, gameResources, userResources, defaultBeatmap, host);
 
-            workingBeatmapCache.BeatmapManager = beatmapModelManager;
             beatmapModelManager.WorkingBeatmapCache = workingBeatmapCache;
         }
 
diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index f4324dcc81..e1399c5272 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public readonly WorkingBeatmap DefaultBeatmap;
 
-        public BeatmapModelManager BeatmapManager { private get; set; }
-
         private readonly AudioManager audioManager;
         private readonly IResourceStore<byte[]> resources;
         private readonly LargeTextureStore largeTextureStore;
@@ -87,8 +85,7 @@ namespace osu.Game.Beatmaps
                     return working;
 
                 // TODO: FUCK THE WORLD :D
-                if (beatmapInfo?.IsManaged == true)
-                    beatmapInfo = beatmapInfo.Detach();
+                beatmapInfo = beatmapInfo.Detach();
 
                 workingCache.Add(working = new BeatmapManagerWorkingBeatmap(beatmapInfo, this));
 
@@ -193,6 +190,9 @@ namespace osu.Game.Beatmaps
             {
                 Storyboard storyboard;
 
+                if (BeatmapInfo.Path == null)
+                    return new Storyboard();
+
                 try
                 {
                     using (var stream = new LineBufferedReader(GetStream(BeatmapSetInfo.GetPathForFile(BeatmapInfo.Path))))