diff --git a/VERSION.txt b/VERSION.txt
index 93db83a608d..4c88a467a07 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -28,6 +28,8 @@ jetty-7.2-SNAPSHOT
  + 324379 Change content type after getWriter
  + 324501 Fire RequestListener.requestDestroyed in last-to-first order.
  + 324601 Check session expiry on access
+ + 324811 NPE in Server.dump
+ + 324812 restore WebAppContext constructor used by geronimo integration
  + JETTY-912 added per exchange timeout api
  + JETTY-1245 Do not use direct buffers with NIO SSL
  + JETTY-1249 Apply max idle time to all connectors
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
index a225a56ab9c..a22950faf7d 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@@ -666,9 +666,11 @@ public class Server extends HandlerWrapper implements Attributes
     protected void dump(Appendable out,String indent) throws IOException
     {
         out.append(toString()).append(isStarted()?" started":" STOPPED").append('\n');
-        for (Connector c : _connectors)
-            out.append(" +-").append(String.valueOf(c)).append('\n');
-        out.append(" +-").append(String.valueOf(_threadPool)).append('\n');
+        if (_connectors != null)
+            for (Connector c : _connectors)
+                out.append(" +-").append(String.valueOf(c)).append('\n');
+        if (_threadPool != null)
+            out.append(" +-").append(String.valueOf(_threadPool)).append('\n');
         dumpHandlers(out,indent);
     }
 
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
index bc4a3de8802..6fc769f10d9 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
@@ -204,6 +204,25 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
         _metadata = new MetaData();
     }
 
+    /* ------------------------------------------------------------ */
+
+    /**
+     * This constructor is used in the geronimo integration.
+     *
+     * @param sessionHandler SessionHandler for this web app
+     * @param securityHandler SecurityHandler for this web app
+     * @param servletHandler ServletHandler for this web app
+     * @param errorHandler ErrorHandler for this web app
+     */
+    public WebAppContext(SessionHandler sessionHandler, SecurityHandler securityHandler, ServletHandler servletHandler, ErrorHandler errorHandler) {
+        super(null, sessionHandler, securityHandler, servletHandler, errorHandler);
+        _scontext = new Context();
+        setErrorHandler(errorHandler != null ? errorHandler : new ErrorPageErrorHandler());
+        //Make a new MetaData to hold descriptor and annotation metadata
+        _metadata = new MetaData();
+
+    }
+
     /* ------------------------------------------------------------ */
     /**
      * Configure this WebAppContext from a shared WebAppContext as template.