Merge fixes of some exceptions made for 121.