diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java index e23c52a124..c476850b28 100644 --- a/core/src/main/java/hudson/util/XStream2.java +++ b/core/src/main/java/hudson/util/XStream2.java @@ -51,6 +51,8 @@ public class XStream2 extends XStream { private static final class AssociatedConverterImpl implements Converter { private Converter findConverter(Class t) { try { + if(t==null || t.getClassLoader()==null) + return null; Class cl = t.getClassLoader().loadClass(t.getName() + "$ConverterImpl"); return (Converter)cl.newInstance(); } catch (ClassNotFoundException e) {