exception fixups for the without case