Some registration error block changes