Add protection against bug in hfsplus.efi