diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 77b320cc18..e88133dedc 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2866,7 +2866,8 @@ namespace BizHawk.Client.EmuHawk
 				if (GlobalWin.Tools.IsLoaded<TAStudio>() &&
 					GlobalWin.Tools.TAStudio.LastPositionFrame == Global.Emulator.Frame)
 				{
-					if (PauseOnFrame.Value <= GlobalWin.Tools.TAStudio.LastPositionFrame)
+					if (PauseOnFrame.HasValue &&
+						PauseOnFrame.Value <= GlobalWin.Tools.TAStudio.LastPositionFrame)
 					{
 						TasMovieRecord record = (Global.MovieSession.Movie as TasMovie)[Global.Emulator.Frame];
 						if (!record.Lagged.HasValue && IsSeeking)
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 58d30da366..7e9b8c76e2 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -94,7 +94,9 @@ namespace BizHawk.Client.EmuHawk
 				TastudioRecordMode();
 				_wasRecording = false;
 			}
-			RefreshDialog();
+
+			if (CurrentTasMovie != null)
+				RefreshDialog();
 		}
 
 		public bool FloatEditingMode