diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index 85b22baa90..a5a99e3894 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -82,8 +82,21 @@ namespace BizHawk.Client.Common
 		public bool BindMarkersToInput { get; set; }
 		public bool UseInputCache { get; set; }
 		public int BranchCount { get { return Branches.Count; } }
-		public TasBranch GetBranch(int index) { return Branches[index]; }
-		public int BranchHashByIndex(int index) { return Branches[index].UniqueIdentifier.GetHashCode(); }
+		public TasBranch GetBranch(int index)
+		{
+			if (index >= Branches.Count)
+				return null; // are we allowed?
+			else
+				return Branches[index];
+		}
+
+		public int BranchHashByIndex(int index)
+		{
+			if (index >= Branches.Count)
+				return -1;
+			else
+				return Branches[index].UniqueIdentifier.GetHashCode();
+		}
 
 		public int BranchIndexByHash(int hash)
 		{
diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index 8b13eb284a..86e572ff12 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -588,6 +588,9 @@ namespace BizHawk.Client.Common
 			}
 			//}
 
+			if (br.PeekChar() == -1) // at least don't crash when loading an old project
+				return;
+
 			currentBranch = br.ReadInt32();
 			int c = br.ReadInt32();
 			BranchStates = new SortedList<int, SortedList<int, StateManagerState>>(c);
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index ada9c4147a..f7692ea626 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -98,19 +98,22 @@ namespace BizHawk.Client.EmuHawk
 
 		private void QueryItemBkColor(int index, InputRoll.RollColumn column, ref Color color)
 		{
-			var record = Tastudio.CurrentTasMovie[GetBranch(index).Frame];
-
-			if (index == CurrentBranch)
-				color = TAStudio.CurrentFrame_InputLog; // SystemColors.HotTrack;
-			else if (record.Lagged.HasValue)
+			TasBranch branch = GetBranch(index);
+			if (branch != null)
 			{
-				if (record.Lagged.Value)
+				var record = Tastudio.CurrentTasMovie[branch.Frame];
+				if (index == CurrentBranch)
+					color = TAStudio.CurrentFrame_InputLog; // SystemColors.HotTrack;
+				else if (record.Lagged.HasValue)
 				{
-					color = TAStudio.LagZone_InputLog;
-				}
-				else
-				{
-					color = TAStudio.GreenZone_InputLog;
+					if (record.Lagged.Value)
+					{
+						color = TAStudio.LagZone_InputLog;
+					}
+					else
+					{
+						color = TAStudio.GreenZone_InputLog;
+					}
 				}
 			}
 
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 2995d1cc8e..444af2c4fc 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -432,8 +432,12 @@ namespace BizHawk.Client.EmuHawk
 
 			if (!HandleMovieLoadStuff(newMovie))
 				return false;
+			
+			// clear all selections
+			TasView.DeselectAll();
+			BookMarkControl.Restart();
+			MarkerControl.Restart();
 
-			BookMarkControl.UpdateValues();
 			RefreshDialog();
 			return true;
 		}