From be00dae474ca8dab27c9776034adb4596c4189e8 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 22 Nov 2014 15:56:02 +0000
Subject: [PATCH] Fix issue 316 - cancelling out of the core picker causes
 exception

---
 BizHawk.Client.Common/RomLoader.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index ba1472454e..f1c4514ae6 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -333,6 +333,9 @@ namespace BizHawk.Client.Common
 								core = CoreInventory.Instance[game.System];
 								break;
 
+							case null:
+								// The user picked nothing in the Core picker
+								break;
 							case "SNES":
 								if (Global.Config.SNES_InSnes9x && VersionInfo.DeveloperBuild)
 								{