Exception modifications/improvements.