Index: java/org/apache/catalina/startup/ContextConfig.java
===================================================================
--- java/org/apache/catalina/startup/ContextConfig.java	(revision 1238784)
+++ java/org/apache/catalina/startup/ContextConfig.java	(working copy)
@@ -2129,16 +2129,18 @@
             String name = className.replace('.', '/') + ".class";
             InputStream is =
                     context.getLoader().getClassLoader().getResourceAsStream(name);
-            ClassParser parser = new ClassParser(is, null);
-            try {
-                JavaClass clazz = parser.parse();
-                populateJavaClassCache(clazz.getClassName(), clazz);
-            } catch (ClassFormatException e) {
-                log.debug(sm.getString("contextConfig.invalidSciHandlesTypes",
-                        className), e);
-            } catch (IOException e) {
-                log.debug(sm.getString("contextConfig.invalidSciHandlesTypes",
-                        className), e);
+            if (is != null) {
+                ClassParser parser = new ClassParser(is, null);
+                try {
+                    JavaClass clazz = parser.parse();
+                    populateJavaClassCache(clazz.getClassName(), clazz);
+                } catch (ClassFormatException e) {
+                    log.debug(sm.getString("contextConfig.invalidSciHandlesTypes",
+                            className), e);
+                } catch (IOException e) {
+                    log.debug(sm.getString("contextConfig.invalidSciHandlesTypes",
+                            className), e);
+                }
             }
         }
     }