Added earlier returns for relations