Extra guarding against crashes in the disenchanter