Maybe a separate if check makes sense here instead of checking the value of a different variable and assuming they're always the same (which even if true now has more potential to break later):

if (entityManagerContext != null) {
  entityManagerContext.pop(true);
}

The if must check entityManager because the problem of the associated issue occurs when the entityManager is not pushed in the entityManagerContext. So the call to pop method only should occurs when the entityManager is not null.

You can check issues #6041 and #7037 to get more information.