Potential fix for NPE in classloader, issue 648