fix up exception as requested