1 files changed, 9 insertions, 5 deletions
diff --git a/src/org/traccar/Main.java b/src/org/traccar/Main.java
index 53abb37e4..834b37eff 100644
--- a/src/org/traccar/Main.java
+++ b/src/org/traccar/Main.java
@@ -23,22 +23,26 @@ public class Main {
     public static void main(String[] args) throws Exception {
         Locale.setDefault(Locale.ENGLISH);
 
-        final ServerManager service = new ServerManager();
-        service.init(args);
+        Context.init(args);
 
         Log.info("Starting server...");
         Log.logSystemInfo();
-        
         Log.info("Version: " + Main.class.getPackage().getImplementationVersion());
 
-        service.start();
+        Context.getServerManager().start();
+        if (Context.getWebServer() != null) {
+            Context.getWebServer().start();
+        }
 
         // Shutdown server properly
         Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
             public void run() {
                 Log.info("Shutting down server...");
-                service.stop();
+                if (Context.getWebServer() != null) {
+                    Context.getWebServer().stop();
+                }
+                Context.getServerManager().stop();
             }
         });
     }