Picking up changes missed in previous commit. These changes were needed to move exception processing to score/cpu.