--- servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java	(revision 951943)
+++ servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java	(working copy)
@@ -512,10 +512,18 @@ 
      * @since 2.0
      */
     public ErrorData getErrorData() {
+        int status = 0;
+        
+        Integer status_code = (Integer)getRequest().getAttribute( 
+                "javax.servlet.error.status_code");
+        // Avoid NPE if attribute is not set
+        if (status_code != null) {
+            status = status_code.intValue();
+        }
+
         return new ErrorData( 
             (Throwable)getRequest().getAttribute( "javax.servlet.error.exception" ),
-            ((Integer)getRequest().getAttribute( 
-                "javax.servlet.error.status_code" )).intValue(),
+            status,
             (String)getRequest().getAttribute( "javax.servlet.error.request_uri" ),
             (String)getRequest().getAttribute( "javax.servlet.error.servlet_name" ) );
     }