Make FindBugs happy by scoping the catches more narrowly.