More null checks in equals for Group