diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index c7137cbab0..6533d51638 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -752,7 +752,14 @@ namespace BizHawk.MultiClient
 
 			else if (MovieImport.IsValidMovieExtension(Path.GetExtension(filePaths[0])))
 			{
-				LoadRom(CurrentlyOpenRom);
+				if (CurrentlyOpenRom == null)
+				{
+					OpenROM();
+					if (CurrentlyOpenRom == null)
+						return;
+				}
+				else
+					LoadRom(CurrentlyOpenRom);
 				string errorMsg = "";
 				string warningMsg = "";
 				Movie m = MovieImport.ImportFile(filePaths[0], out errorMsg, out warningMsg);
diff --git a/BizHawk.MultiClient/config/PathManager.cs b/BizHawk.MultiClient/config/PathManager.cs
index 506d207e85..7646b53888 100644
--- a/BizHawk.MultiClient/config/PathManager.cs
+++ b/BizHawk.MultiClient/config/PathManager.cs
@@ -282,7 +282,10 @@ namespace BizHawk.MultiClient
 		{
 			string name = FilesystemSafeName(game);
 			if (Global.MainForm.MovieActive())
+			{
+				
 				name += "." + Path.GetFileNameWithoutExtension(Global.MovieSession.Movie.Filename);
+			}
 
 			switch (game.System)
 			{
@@ -296,8 +299,8 @@ namespace BizHawk.MultiClient
 				case "GEN": return Path.Combine(MakeAbsolutePath(Global.Config.PathGenesisSaveRAM, "GEN"), name + ".SaveRAM");
 				case "NES": return Path.Combine(MakeAbsolutePath(Global.Config.PathNESSaveRAM, "NES"), name + ".SaveRAM");
 				case "TI83": return Path.Combine(MakeAbsolutePath(Global.Config.PathTI83SaveRAM, "TI83"), name + ".SaveRAM");
+				default: return Path.Combine(GetBasePathAbsolute(), name + ".SaveRAM");
 			}
-			return "";
 		}
 
 		public static string SaveStatePrefix(GameInfo game)
diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs
index 064b5912f3..a99e3594fa 100644
--- a/BizHawk.MultiClient/movie/Movie.cs
+++ b/BizHawk.MultiClient/movie/Movie.cs
@@ -83,6 +83,8 @@ namespace BizHawk.MultiClient
 
 		public void ClearSaveRAM()
 		{
+			string x = PathManager.SaveRamPath(Global.Game);
+			
 			var file = new FileInfo(PathManager.SaveRamPath(Global.Game));
 			if (file.Exists) file.Delete();
 		}