From 7c83b91e83bc2654dadfa9115afd0ae7335daa06 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 29 Nov 2014 00:28:48 +0000
Subject: [PATCH] Ram Watch - fix a bug where loading a watch file with
 separators would throw a null reference exception

---
 BizHawk.Client.Common/tools/WatchList.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.Common/tools/WatchList.cs b/BizHawk.Client.Common/tools/WatchList.cs
index 26eab6b70b..d75043e5f2 100644
--- a/BizHawk.Client.Common/tools/WatchList.cs
+++ b/BizHawk.Client.Common/tools/WatchList.cs
@@ -38,7 +38,10 @@ namespace BizHawk.Client.Common
 
 			_watchList.ForEach(w =>
 			{
-				w.Domain = _core.MemoryDomains[w.Domain.Name];
+				if (w.Domain != null)
+				{
+					w.Domain = _core.MemoryDomains[w.Domain.Name];
+				}
 			});
 		}