diff --git a/Blarg.GameFramework/Entities/EntityManager.cs b/Blarg.GameFramework/Entities/EntityManager.cs
index 30a24c4..7f9032b 100644
--- a/Blarg.GameFramework/Entities/EntityManager.cs
+++ b/Blarg.GameFramework/Entities/EntityManager.cs
@@ -97,13 +97,11 @@ namespace Blarg.GameFramework.Entities
 			if (componentEntities == null)
 				return null;
 
-			if (componentEntities.Count > 0)
-				return componentEntities.Keys.GetEnumerator().Current;
-			else
-				return null;
+			var enumerator = componentEntities.Keys.GetEnumerator();
+			enumerator.MoveNext();
+			return enumerator.Current;
 		}
 
-
 		public void GetAllWith<T>(EntityList list, bool clearListFirst = true) where T : Component
 		{
 			if (list == null)