#691 - Add some NPE protection for entities using admin auditable embedded