Could return early here - or combine with boolean check below?