diff --git a/BizHawk.Client.Common/BinarySaveStates.cs b/BizHawk.Client.Common/BinarySaveStates.cs
index 85926806d0..8bf3a327a7 100644
--- a/BizHawk.Client.Common/BinarySaveStates.cs
+++ b/BizHawk.Client.Common/BinarySaveStates.cs
@@ -167,6 +167,13 @@ namespace BizHawk.Client.Common
 			}
 		}
 
+		public bool HasLump(BinaryStateLump lump)
+		{
+			string name = BinaryStateFileNames.GetReadName(lump);
+			ZipEntry e;
+			return _entriesbyname.TryGetValue(name, out e);
+		}
+
 		/// <summary>
 		/// Gets a lump
 		/// </summary>
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
index 0d83152424..79c7a585d2 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
@@ -183,7 +183,7 @@ namespace BizHawk.Client.Common
 					}
 				});
 
-				if (GetClientSettingsOnLoad != null)
+				if (GetClientSettingsOnLoad != null && bl.HasLump(BinaryStateLump.ClientSettings))
 				{
 					string clientSettings = string.Empty;
 					bl.GetLump(BinaryStateLump.ClientSettings, true, delegate(TextReader tr)