From 1f9f712af9286bd2974abeae033c3da4d3fb8e90 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Fri, 17 Jul 2015 11:48:02 -0500
Subject: [PATCH] psx - fix loading m3u with non-good discs

---
 BizHawk.Client.Common/RomLoader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index ae9fade246..aa10a779e4 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -270,7 +270,7 @@ namespace BizHawk.Client.Common
 							{
 								string discHash = new DiscHasher(disc).Calculate_PSX_BizIDHash().ToString("X8");
 								game = Database.CheckDatabase(discHash);
-								if (game.IsRomStatusBad() || game.Status == RomStatus.NotInDatabase)
+								if (game == null || game.IsRomStatusBad() || game.Status == RomStatus.NotInDatabase)
 									sw.WriteLine("Disc could not be identified as known-good. Look for a better rip.");
 								else
 								{