1.6 catch block changes