Hi. Could you please take a look on the fix: http://cr.openjdk.java.net/~shurailine/8156972/webrev.00/
Besides adding @modules, I have also added a couple of lines to the library class, because I have found the NPE which I was getting originally non-informative. Shura
