diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/StartMenuScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/StartMenuScreen.java
index 7d8b561..b12e02b 100644
--- a/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/StartMenuScreen.java
+++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/StartMenuScreen.java
@@ -47,12 +47,13 @@ public class StartMenuScreen extends AbstractScreen {
             public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
                 try {
                     roboRallyWrapper.server = new RoboRallyServer();
-                    roboRallyWrapper.client = new RoboRallyClient("127.0.0.1",roboRallyWrapper);
+                    roboRallyWrapper.client = new RoboRallyClient("127.0.0.1", roboRallyWrapper);
                     roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getUsernameScreen(roboRallyWrapper));
                 } catch (IOException e) {
                     e.printStackTrace();
                     //Hard fail
-                    System.exit(1);
+                    Gdx.app.error("Server error", "Server could not be started");
+                    Gdx.app.exit();
                 }
                 return true;
             }
@@ -80,7 +81,7 @@ public class StartMenuScreen extends AbstractScreen {
         quitButton.addListener(new InputListener() {
             @Override
             public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
-                System.exit(0);
+                Gdx.app.exit();
                 return true;
             }
         });