Upgrade to Java 7, changed exceptions