diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/IDisassemblable.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/IDisassemblable.cs
index 688890ec68..d3f2176a41 100644
--- a/BizHawk.Emulation.Cores/CPUs/HuC6280/IDisassemblable.cs
+++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/IDisassemblable.cs
@@ -26,13 +26,9 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 
 		public string Disassemble(MemoryDomain m, uint addr, out int length)
 		{
-			if (m.Size != 0x10000)
-				throw new InvalidOperationException("Something needs to be figured out...");
-
 			return DisassembleExt((ushort)addr, out length,
 				(a) => m.PeekByte(a),
 				(a) => (ushort)(m.PeekByte(a) | m.PeekByte(a + 1) << 8));
-
 		}
 	}
 }
diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
index 31845df767..69d0c69e40 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs	
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs	
@@ -474,7 +474,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
 				(addr, value) => Ram[addr] = value);
 			domains.Add(MainMemoryDomain);
 
-			var SystemBusDomain = new MemoryDomain("System Bus", 0x200000, MemoryDomain.Endian.Little,
+			var SystemBusDomain = new MemoryDomain("System Bus (21 bit)", 0x200000, MemoryDomain.Endian.Little,
 				(addr) =>
 				{
 					if (addr < 0 || addr >= 0x200000)
@@ -489,7 +489,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
 				});
 			domains.Add(SystemBusDomain);
 
-			var CpuBusDomain = new MemoryDomain("CPU Bus", 0x10000, MemoryDomain.Endian.Little,
+			var CpuBusDomain = new MemoryDomain("System Bus", 0x10000, MemoryDomain.Endian.Little,
 				(addr) =>
 				{
 					if (addr < 0 || addr >= 0x10000)