Here's a small fix to remove a duplicate InvalidTypeException. The other reported locations appear to have already been fixed. Issue: https://bugs.openjdk.java.net/browse/JDK-8167253 Webrev: http://cr.openjdk.java.net/~gadams/8167253/