From 37e75e9a54a95881bd8b96e36a6ce8fc856605ce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Feb 2017 15:59:57 +0900
Subject: [PATCH] Add null check when loading beatmap background.

---
 osu.Game/Beatmaps/WorkingBeatmap.cs                   | 2 +-
 osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 019674c3ad..446aaf8e49 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -30,7 +30,7 @@ public Texture Background
                 {
                     if (background != null) return background;
 
-                    if (BeatmapInfo.Metadata?.BackgroundFile == null) return null;
+                    if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
 
                     try
                     {
diff --git a/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs
index 61b3a89ca0..65b50542ce 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs
@@ -84,7 +84,7 @@ public BeatmapBackground(WorkingBeatmap beatmap)
             [BackgroundDependencyLoader]
             private void load()
             {
-                Sprite.Texture = beatmap.Background;
+                Sprite.Texture = beatmap?.Background;
             }
         }
     }