--- /home/developer/jython2.5b0/src/org/python/core/SyspathJavaLoader.java	2008-10-31 13:54:20.000000000 +0200
+++ /home/developer/jython2.5b0/src/org/python/core/SyspathJavaLoader.java	2008-12-29 16:52:13.000000000 +0200
@@ -22,6 +22,10 @@ public class SyspathJavaLoader extends C
         Py.writeDebug("resource", "trying resource: " + res);
         PySystemState sys = Py.getSystemState();
         ClassLoader classLoader = sys.getClassLoader();
+
+        if (classLoader == null) {
+            classLoader = Thread.currentThread().getContextClassLoader();
+        }
         if (classLoader != null) {
             return classLoader.getResourceAsStream(res);
         }
@@ -82,6 +86,10 @@ public class SyspathJavaLoader extends C
         // defer to it.
         PySystemState sys = Py.getSystemState();
         ClassLoader classLoader = sys.getClassLoader();
+
+        if (classLoader == null) {
+            classLoader = Thread.currentThread().getContextClassLoader();
+        }
         if (classLoader != null) {
             return classLoader.loadClass(name);
         }