Expand catch statements to fix Java 1.6 issues