diff --git a/BizHawk.Client.EmuHawk/Input/GamePad.cs b/BizHawk.Client.EmuHawk/Input/GamePad.cs
index cca926a100..3c3705bd50 100644
--- a/BizHawk.Client.EmuHawk/Input/GamePad.cs
+++ b/BizHawk.Client.EmuHawk/Input/GamePad.cs
@@ -48,9 +48,12 @@ namespace BizHawk.Client.EmuHawk
 
 		public static void CloseAll()
 		{
-			foreach (var device in Devices)
-				device.joystick.Dispose();
-			Devices.Clear();
+			if (Devices != null)
+			{
+				foreach (var device in Devices)
+					device.joystick.Dispose();
+				Devices.Clear();
+			}
 		}
 
 		// ********************************** Instance Members **********************************
diff --git a/BizHawk.Client.EmuHawk/Program.cs b/BizHawk.Client.EmuHawk/Program.cs
index 64b5466392..154f12ae8e 100644
--- a/BizHawk.Client.EmuHawk/Program.cs
+++ b/BizHawk.Client.EmuHawk/Program.cs
@@ -273,7 +273,8 @@ REDO_DISPMETHOD:
 
 			void this_StartupNextInstance(object sender, StartupNextInstanceEventArgs e)
 			{
-				(MainForm as MainForm).LoadRom(e.CommandLine[0]);
+				if (e.CommandLine.Count >= 1)
+					(MainForm as MainForm).LoadRom(e.CommandLine[0]);
 			}
 
 			protected override void OnCreateMainForm()