Your commit is fine except undoing the change NOT to replace conceptToValidate.getConceptId() != null with conceptToValidate.getUuid() != null on line 180 above in red but the equals should still use getUuid()