APOLLO-3841 NullEntity created