diff --git a/src/helma/main/ApplicationManager.java b/src/helma/main/ApplicationManager.java
index 8b822d1f..f58ed817 100644
--- a/src/helma/main/ApplicationManager.java
+++ b/src/helma/main/ApplicationManager.java
@@ -44,6 +44,17 @@ public class ApplicationManager implements XmlRpcHandler {
     private long lastModified;
     private JettyServer jetty = null;
 
+    /**
+     * Creates a new ApplicationManager object.
+     *
+     * @param props the properties defining the running apps
+     * @param server the server instance
+     */
+    public ApplicationManager(ResourceProperties props,
+                              Server server) {
+        this(props, server, 0);
+    }
+
     /**
      * Creates a new ApplicationManager object.
      *
diff --git a/src/helma/main/CommandlineRunner.java b/src/helma/main/CommandlineRunner.java
index 7dd04339..31bcce20 100644
--- a/src/helma/main/CommandlineRunner.java
+++ b/src/helma/main/CommandlineRunner.java
@@ -86,7 +86,7 @@ public class CommandlineRunner {
         // init a server instance and start the application
         Server server = new Server(config);
         server.init();
-        server.checkAppManager(0);
+        server.checkAppManager();
         server.startApplication(appName);
         Application app = server.getApplication(appName);
 
diff --git a/src/helma/main/Server.java b/src/helma/main/Server.java
index fba0398b..0107f092 100644
--- a/src/helma/main/Server.java
+++ b/src/helma/main/Server.java
@@ -616,8 +616,8 @@ public class Server implements Runnable {
                 // create application manager which binds to the given RMI port
                 appManager = new ApplicationManager(appsProps, this, rmiPort.getPort());
             } else {
-                // create application manager with RMI port 0
-                appManager = new ApplicationManager(appsProps, this, 0);
+                // create application manager without RMI port
+                appManager = new ApplicationManager(appsProps, this);
             }
 
             if (xmlrpc != null) {
@@ -677,9 +677,9 @@ public class Server implements Runnable {
      * Make sure this server has an ApplicationManager (e.g. used when
      * accessed from CommandlineRunner)
      */
-    public void checkAppManager(int port) {
+    public void checkAppManager() {
         if (appManager == null) {
-            appManager = new ApplicationManager(appsProps, this, port);
+            appManager = new ApplicationManager(appsProps, this);
         }
     }