diff --git a/BizHawk.MultiClient/LuaImplementation.cs b/BizHawk.MultiClient/LuaImplementation.cs
index 29133923fa..d663d1f486 100644
--- a/BizHawk.MultiClient/LuaImplementation.cs
+++ b/BizHawk.MultiClient/LuaImplementation.cs
@@ -2106,14 +2106,24 @@ namespace BizHawk.MultiClient
 
 		public void joypad_set(LuaTable buttons, object controller = null)
 		{
-			foreach (var button in buttons.Keys)
+			try
 			{
-				if (Convert.ToBoolean(buttons[button]) == true)
-					if (controller == null)
-						Global.ClickyVirtualPadController.Click(button.ToString());
-					else
-						Global.ClickyVirtualPadController.Click("P" + controller.ToString() + " " + button.ToString());
+				foreach (var button in buttons.Keys)
+				{
+					if (Convert.ToBoolean(buttons[button]) == true)
+					{
+						if (controller == null)
+						{
+							Global.ClickyVirtualPadController.Click(button.ToString());
+						}
+						else
+						{
+							Global.ClickyVirtualPadController.Click("P" + controller.ToString() + " " + button.ToString());
+						}
+					}
+				}
 			}
+			catch { /*Eat it*/ } 
 		}
 
 		//----------------------------------------------------
diff --git a/BizHawk.MultiClient/tools/LuaConsole.cs b/BizHawk.MultiClient/tools/LuaConsole.cs
index 11f64bd22b..389583bd85 100644
--- a/BizHawk.MultiClient/tools/LuaConsole.cs
+++ b/BizHawk.MultiClient/tools/LuaConsole.cs
@@ -866,8 +866,10 @@ namespace BizHawk.MultiClient
 							if (!prohibit)
 							{
 								//restore this lua thread's preferred current directory
-								Environment.CurrentDirectory = lf.CurrentDirectory;
-								
+								if (lf.CurrentDirectory != null)
+								{
+									Environment.CurrentDirectory = lf.CurrentDirectory;
+								}
 								var result = LuaImp.ResumeScript(lf.Thread);
 								if (result.Terminated) lf.Stop();
 								lf.FrameWaiting = result.WaitForFrame;