diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index f8bc32431c..e10da39055 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -988,8 +988,7 @@ namespace osu.Game
             if (cache)
                 dependencies.CacheAs(component);
 
-            var drawableComponent = component as Drawable;
-            Debug.Assert(drawableComponent != null);
+            var drawableComponent = component as Drawable ?? throw new ArgumentException($"Component must be a {nameof(Drawable)}", nameof(component));
 
             if (component is OsuFocusedOverlayContainer overlay)
                 focusedOverlays.Add(overlay);