diff --git a/src/helma/main/CommandlineRunner.java b/src/helma/main/CommandlineRunner.java
index cf2384f8..2a20f7c2 100644
--- a/src/helma/main/CommandlineRunner.java
+++ b/src/helma/main/CommandlineRunner.java
@@ -105,9 +105,8 @@ public class CommandlineRunner {
             }
         }
 
-        // stop the application
-        server.stopApplication(appName);
-
+        // stop the application and server
+        server.stop();
     }