diff --git a/client/app/src/main/java/main/MainApplication.java b/client/app/src/main/java/main/MainApplication.java
index 403a853..0ecfff9 100644
--- a/client/app/src/main/java/main/MainApplication.java
+++ b/client/app/src/main/java/main/MainApplication.java
@@ -22,6 +22,8 @@ public class MainApplication extends Application {
             config = new Config(false, -1, "");
         }
 
+        DataController.SERVER_URL = config.toServerUrl();
+
         System.out.println("Ignore 'Illegal reflective access operation'-Warning. See https://github.com/sshahine/JFoenix/issues/1170");
 
         if(
@@ -39,8 +41,6 @@ public class MainApplication extends Application {
                 ConfigLoader.save(config);
             }
 
-            DataController.SERVER_URL = config.toServerUrl();
-
             // Load main-scene
             loadMainScene(stage);
 
diff --git a/client/data/src/main/java/container/Event.java b/client/data/src/main/java/container/Event.java
index 35c1d35..b9958bd 100644
--- a/client/data/src/main/java/container/Event.java
+++ b/client/data/src/main/java/container/Event.java
@@ -56,7 +56,7 @@ public class Event {
         this.isFullDay = isFullDay;
         this.isPrivate = isPrivate;
         if (start != null) this.start = start.toString();
-        if (start != null) this.end = end.toString();
+        if (end != null) this.end = end.toString();
         this.date = date;
         this.ownerId = ownerId;
     }