diff --git a/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java b/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
index 35842ccc20..2120686c15 100644
--- a/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
+++ b/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
@@ -3007,8 +3007,13 @@ private void buildEducationMenusMassEnroll(Campaign campaign, List<Person> perso
                 // find the first faction that accepts applications from all persons in personnel
                 Optional<String> suitableFaction = personnel.stream()
                         .map(person -> academy.getFilteredFaction(campaign, person, campaign.getCurrentSystem().getFactions(campaign.getLocalDate())))
-                        .filter(faction -> personnel.stream().allMatch(person -> faction.equals(academy.getFilteredFaction(campaign, person, campaign.getCurrentSystem().getFactions(campaign.getLocalDate())))))
+                        .filter(faction -> personnel.stream().allMatch(person ->
+                                Objects.equals(
+                                        faction,
+                                        academy.getFilteredFaction(campaign, person, campaign.getCurrentSystem().getFactions(campaign.getLocalDate()))
+                                )))
                         .distinct()
+                        .filter(Objects::nonNull)
                         .findFirst();
 
                 if (suitableFaction.isPresent()) {