Add extra checks when loading from Essentials