app/models/katello/pool.rb in katello-4.7.6 vs app/models/katello/pool.rb in katello-4.8.0.rc1

@@ -54,10 +54,13 @@
     validates :organization, :presence => true
 
     validate :subscription_matches_organization
 
     def subscription_matches_organization
-      errors.add(:base, _("A Pool and its Subscription cannot belong to different organizations")) unless subscription&.organization_id == self.organization_id
+      return if errors[:subscription].any? || errors[:organization].any? # let other validations catch this
+      unless subscription&.organization_id == self.organization_id
+        errors.add(:base, _("A Pool and its Subscription cannot belong to different organizations."))
+      end
     end
 
     DAYS_RECENTLY_EXPIRED = 30
 
     def redhat?