diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
index c05a76157c..3b2806e539 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
@@ -25,6 +25,32 @@ namespace BizHawk.Client.EmuHawk
 			get { return Core.GetCpuFlagsAndRegisters()[Disassembler.PCRegisterName]; }
 		}
 
+		#region Implementation checking
+
+		private bool CanDisassemble
+		{
+			get
+			{
+				if (Disassembler == null)
+				{
+					return false;
+				}
+
+				try
+				{
+					var pc = PC;
+					return true;
+				}
+				catch (NotImplementedException)
+				{
+					return false;
+				}
+
+			}
+		}
+
+		#endregion
+
 		public void UpdateValues()
 		{
 			RegisterPanel.UpdateValues();