Move exception types in 2.5 branch