Modified exceptions to match 4.0