diff --git a/src/BizHawk.Common/Extensions/CollectionExtensions.cs b/src/BizHawk.Common/Extensions/CollectionExtensions.cs
index 0ef20205de..edc01b9534 100644
--- a/src/BizHawk.Common/Extensions/CollectionExtensions.cs
+++ b/src/BizHawk.Common/Extensions/CollectionExtensions.cs
@@ -108,14 +108,10 @@ namespace BizHawk.Common.CollectionExtensions
 		public static T? FirstOrNull<T>(this IEnumerable<T> list, Func<T, bool> predicate)
 			where T : struct
 		{
-			try
-			{
-				return list.First(predicate);
-			}
-			catch (InvalidOperationException)
-			{
-				return null;
-			}
+			foreach (var t in list)
+				if (predicate(t))
+					return t;
+			return null;
 		}
 	}
 }