From 0b16e367766be3ad2d727897c934825766898b42 Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Sat, 29 Nov 2014 18:57:57 +0000
Subject: [PATCH] fix issue 330

---
 BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index 2bc7dd230e..34794f1f9b 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -198,6 +198,7 @@ namespace BizHawk.Client.EmuHawk
 			if (!Global.Emulator.HasMemoryDomains())
 			{
 				Close();
+				return;
 			}
 
 			_core = (IMemoryDomains)Global.Emulator; // Cast is intentional, better to get a cast exception than a null reference exception later