Added short-circuit to findElement