diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index dbc11f49e2..242562176e 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -505,7 +505,7 @@ namespace BizHawk.MultiClient
 
 				//try binding normal rom extensions first
 				if (!file.IsBound)
-					file.BindSoleItemOf("SMS", "PCE", "SGX", "GG", "SG", "BIN", "SMD", "GB", "NES");
+					file.BindSoleItemOf("SMS", "PCE", "SGX", "GG", "SG", "BIN", "SMD", "GB", "NES", "ROM");
 
 				//if we have an archive and need to bind something, then pop the dialog
 				if (file.IsArchive && !file.IsBound)
@@ -1470,7 +1470,7 @@ namespace BizHawk.MultiClient
         {
             var ofd = new OpenFileDialog();
             ofd.InitialDirectory = Global.Config.LastRomPath;
-            ofd.Filter = "Rom Files|*.NES;*.SMS;*.GG;*.SG;*.PCE;*.SGX;*.GB;*.BIN;*.SMD;*.ZIP;*.7z|NES|*.NES|Master System|*.SMS;*.GG;*.SG;*.ZIP;*.7z|PC Engine|*.PCE;*.SGX;*.ZIP;*.7z|Gameboy|*.GB;*.ZIP;*.7z|Archive Files|*.zip;*.7z|All Files|*.*";
+            ofd.Filter = "Rom Files|*.NES;*.SMS;*.GG;*.SG;*.PCE;*.SGX;*.GB;*.BIN;*.SMD;*.ROM;*.ZIP;*.7z|NES|*.NES|Master System|*.SMS;*.GG;*.SG;*.ZIP;*.7z|PC Engine|*.PCE;*.SGX;*.ZIP;*.7z|Gameboy|*.GB;*.ZIP;*.7z|TI-83|*.rom|Archive Files|*.zip;*.7z|All Files|*.*";
             ofd.RestoreDirectory = true;
 
             Global.Sound.StopSound();
diff --git a/BizHawk.MultiClient/NEStools/NESDebugger.cs b/BizHawk.MultiClient/NEStools/NESDebugger.cs
index 78f46ce2d6..ceb9d1e9f0 100644
--- a/BizHawk.MultiClient/NEStools/NESDebugger.cs
+++ b/BizHawk.MultiClient/NEStools/NESDebugger.cs
@@ -25,7 +25,7 @@ namespace BizHawk.MultiClient
 
         public void Restart()
         {
-
+            if (!this.IsHandleCreated || this.IsDisposed) return;
         }
 
         private void NESDebugger_Load(object sender, EventArgs e)
diff --git a/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs b/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs
index 1d2ad2dfcd..515ec463d9 100644
--- a/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs
+++ b/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs
@@ -64,6 +64,7 @@ namespace BizHawk.MultiClient
         public void Restart()
         {
             if (!(Global.Emulator is NES)) this.Close();
+            if (!this.IsHandleCreated || this.IsDisposed) return;
             Nes = Global.Emulator as NES;
         }
 
diff --git a/BizHawk.MultiClient/NEStools/NESPPU.cs b/BizHawk.MultiClient/NEStools/NESPPU.cs
index 9aaa5f1b2b..0ccdd2e128 100644
--- a/BizHawk.MultiClient/NEStools/NESPPU.cs
+++ b/BizHawk.MultiClient/NEStools/NESPPU.cs
@@ -41,6 +41,7 @@ namespace BizHawk.MultiClient
 		public void Restart()
 		{
 			if (!(Global.Emulator is NES)) this.Close();
+            if (!this.IsHandleCreated || this.IsDisposed) return;
 			Nes = Global.Emulator as NES;
 		}
 
diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs
index da3fda099e..e16e39fac3 100644
--- a/BizHawk.MultiClient/tools/Cheats.cs
+++ b/BizHawk.MultiClient/tools/Cheats.cs
@@ -72,7 +72,8 @@ namespace BizHawk.MultiClient
 
         public void Restart()
         {
-            NewCheatList();
+            NewCheatList(); //Should be run even if dialog isn't open so cheats system can work
+            if (!this.IsHandleCreated || this.IsDisposed) return;
             ClearFields();
         }
 
diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs
index 561399df77..0811743dd8 100644
--- a/BizHawk.MultiClient/tools/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.cs
@@ -76,6 +76,7 @@ namespace BizHawk.MultiClient
 
         public void Restart()
         {
+            if (!this.IsHandleCreated || this.IsDisposed) return;
             SetMemoryDomainMenu(); //Calls update routines
             MemoryViewer.ResetScrollBar();
         }
diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs
index 49828e1597..54279e3ed5 100644
--- a/BizHawk.MultiClient/tools/RamSearch.cs
+++ b/BizHawk.MultiClient/tools/RamSearch.cs
@@ -127,6 +127,7 @@ namespace BizHawk.MultiClient
 
         public void Restart()
         {
+            if (!this.IsHandleCreated || this.IsDisposed) return;
             SetMemoryDomainMenu();  //Calls Start New Search
         }
 
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index 549be81898..1ce43befba 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -17,6 +17,7 @@ namespace BizHawk.MultiClient
     public partial class RamWatch : Form
     {
         //TODO: 
+        //Restart() method to be called in main
         //Restore window size should restore column order as well
         //When receiving a watch from a different domain, should something be done?