without a reproducer it is difficult to say if the fact that entityEntry is null is not caused by something else going wrong.